Manual merge with Linus.

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c

327 files changed, 3700 insertions, 17376 deletions

diff --git a/arch/ppc/4xx_io/serial_sicc.c b/arch/ppc/4xx_io/serial_sicc.c
index 8ace2a1f3b48..98b25fa0049a 100644
--- a/arch/ppc/4xx_io/serial_sicc.c
+++ b/arch/ppc/4xx_io/serial_sicc.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/4xx_io/serial_sicc.c
- *
  *  Driver for IBM STB3xxx SICC serial port
  *
  *  Based on drivers/char/serial_amba.c, by ARM Ltd.
@@ -1639,9 +1637,8 @@ static struct SICC_info *siccuart_get(int line)
     state->count++;
     if (state->info)
         return state->info;
-    info = kmalloc(sizeof(struct SICC_info), GFP_KERNEL);
+    info = kzalloc(sizeof(struct SICC_info), GFP_KERNEL);
     if (info) {
-        memset(info, 0, sizeof(struct SICC_info));
         init_waitqueue_head(&info->open_wait);
         init_waitqueue_head(&info->close_wait);
         init_waitqueue_head(&info->delta_msr_wait);
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c
index 579cd40258b9..12b84ca51327 100644
--- a/arch/ppc/8xx_io/commproc.c
+++ b/arch/ppc/8xx_io/commproc.c
@@ -73,7 +73,7 @@ cpm_mask_irq(unsigned int irq)
 {
         int cpm_vec = irq - CPM_IRQ_OFFSET;
 
-        out_be32(&((immap_t *)IMAP_ADDR)->im_cpic.cpic_cimr, in_be32(&((immap_t *)IMAP_ADDR)->im_cpic.cpic_cimr) & ~(1 << cpm_vec));
+        clrbits32(&((immap_t *)IMAP_ADDR)->im_cpic.cpic_cimr, (1 << cpm_vec));
 }
 
 static void
@@ -81,7 +81,7 @@ cpm_unmask_irq(unsigned int irq)
 {
         int cpm_vec = irq - CPM_IRQ_OFFSET;
 
-        out_be32(&((immap_t *)IMAP_ADDR)->im_cpic.cpic_cimr, in_be32(&((immap_t *)IMAP_ADDR)->im_cpic.cpic_cimr) | (1 << cpm_vec));
+        setbits32(&((immap_t *)IMAP_ADDR)->im_cpic.cpic_cimr, (1 << cpm_vec));
 }
 
 static void
@@ -198,7 +198,7 @@ cpm_interrupt_init(void)
         if (setup_irq(CPM_IRQ_OFFSET + CPMVEC_ERROR, &cpm_error_irqaction))
                 panic("Could not allocate CPM error IRQ!");
 
-        out_be32(&((immap_t *)IMAP_ADDR)->im_cpic.cpic_cicr, in_be32(&((immap_t *)IMAP_ADDR)->im_cpic.cpic_cicr) | CICR_IEN);
+        setbits32(&((immap_t *)IMAP_ADDR)->im_cpic.cpic_cicr, CICR_IEN);
 }
 
 /*
diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c
index 49eb2a7e65c0..a892356d5c3b 100644
--- a/arch/ppc/8xx_io/cs4218_tdm.c
+++ b/arch/ppc/8xx_io/cs4218_tdm.c
@@ -126,11 +126,11 @@ static int numReadBufs = 4, readbufSize = 32;
 */
 static volatile cbd_t   *rx_base, *rx_cur, *tx_base, *tx_cur;
 
-MODULE_PARM(catchRadius, "i");
-MODULE_PARM(numBufs, "i");
-MODULE_PARM(bufSize, "i");
-MODULE_PARM(numreadBufs, "i");
-MODULE_PARM(readbufSize, "i");
+module_param(catchRadius, int, 0);
+module_param(numBufs, int, 0);
+module_param(bufSize, int, 0);
+module_param(numreadBufs, int, 0);
+module_param(readbufSize, int, 0);
 
 #define arraysize(x)    (sizeof(x)/sizeof(*(x)))
 #define le2be16(x)      (((x)<<8 & 0xff00) | ((x)>>8 & 0x00ff))
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 11899f06bf06..e9a8f5d1dfcd 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -19,6 +19,10 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
 
+config GENERIC_HWEIGHT
+        bool
+        default y
+
 config GENERIC_CALIBRATE_DELAY
         bool
         default y
@@ -57,15 +61,15 @@ config 6xx
         select PPC_FPU
         help
           There are four types of PowerPC chips supported.  The more common
-          types (601, 603, 604, 740, 750, 7400), the Motorola embedded
-          versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the IBM
-          embedded versions (403 and 405) and the POWER3 processor.
-          (For support for more recent 64-bit processors, set ARCH=powerpc.)
+          types (601, 603, 604, 740, 750, 7400), the older Freescale
+          (formerly Motorola) embedded versions (821, 823, 850, 855, 860,
+          52xx, 82xx, 83xx), the IBM embedded versions (403 and 405) and
+          the Book E embedded processors from IBM (44x) and Freescale (85xx).
+          For support for 64-bit processors, set ARCH=powerpc.
           Unless you are building a kernel for one of the embedded processor
-          systems or a POWER3-based IBM RS/6000, choose 6xx.
-          Note that the kernel runs in 32-bit mode even on 64-bit chips.
-          Also note that because the 52xx, 82xx, & 83xx family has a 603e core,
-          specific support for that chipset is asked later on.
+          systems, choose 6xx.
+          Also note that because the 52xx, 82xx, & 83xx family have a 603e
+          core, specific support for that chipset is asked later on.
 
 config 40x
         bool "40x"
@@ -73,10 +77,6 @@ config 40x
 config 44x
         bool "44x"
 
-config POWER3
-        select PPC_FPU
-        bool "POWER3"
-
 config 8xx
         bool "8xx"
 
@@ -248,14 +248,9 @@ config PPC601_SYNC_FIX
 source arch/ppc/platforms/4xx/Kconfig
 source arch/ppc/platforms/85xx/Kconfig
 
-config PPC64BRIDGE
-        bool
-        depends on POWER3
-        default y
-
 config PPC_STD_MMU
         bool
-        depends on 6xx || POWER3
+        depends on 6xx
         default y
 
 config NOT_COHERENT_CACHE
@@ -481,10 +476,57 @@ config WINCEPT
 
 endchoice
 
+menu "Freescale Ethernet driver platform-specific options"
+        depends on FS_ENET
+
+        config MPC8xx_SECOND_ETH
+        bool "Second Ethernet channel"
+        depends on (MPC885ADS || MPC86XADS)
+        default y
+        help
+          This enables support for second Ethernet on MPC885ADS and MPC86xADS boards.
+          The latter will use SCC1, for 885ADS you can select it below.
+
+        choice
+                prompt "Second Ethernet channel"
+                depends on MPC8xx_SECOND_ETH
+                default MPC8xx_SECOND_ETH_FEC2
+
+                config MPC8xx_SECOND_ETH_FEC2
+                bool "FEC2"
+                depends on MPC885ADS
+                help
+                  Enable FEC2 to serve as 2-nd Ethernet channel. Note that SMC2
+                  (often 2-nd UART) will not work if this is enabled.
+
+                config MPC8xx_SECOND_ETH_SCC1
+                bool "SCC1"
+                depends on MPC86XADS
+                select MPC8xx_SCC_ENET_FIXED
+                help
+                  Enable SCC1 to serve as 2-nd Ethernet channel. Note that SMC1
+                  (often 1-nd UART) will not work if this is enabled.
+
+                config MPC8xx_SECOND_ETH_SCC3
+                bool "SCC3"
+                depends on MPC885ADS
+                help
+                  Enable SCC3 to serve as 2-nd Ethernet channel. Note that SMC1
+                  (often 1-nd UART) will not work if this is enabled.
+
+        endchoice
+
+        config MPC8xx_SCC_ENET_FIXED
+        depends on MPC8xx_SECOND_ETH_SCC
+        default n
+        bool "Use fixed MII-less mode for SCC Ethernet"
+
+endmenu
+
 choice
         prompt "Machine Type"
-        depends on 6xx || POWER3
-        default PPC_MULTIPLATFORM
+        depends on 6xx
+        default PPC_PREP
         ---help---
           Linux currently supports several different kinds of PowerPC-based
           machines: Apple Power Macintoshes and clones (such as the Motorola
@@ -494,15 +536,14 @@ choice
           Platform) machines (including all of the recent IBM RS/6000 and
           pSeries machines), and several embedded PowerPC systems containing
           4xx, 6xx, 7xx, 8xx, 74xx, and 82xx processors.  Currently, the
-          default option is to build a kernel which works on PReP and CHRP.
+          default option is to build a kernel which works on PReP.
 
-          Note that support for Apple machines is now only available with
-          ARCH=powerpc, and has been removed from this menu.  If you wish
-          to build a kernel for an Apple machine, exit this configuration
-          process and re-run it with ARCH=powerpc.
+          Note that support for Apple and CHRP machines is now only available
+          with ARCH=powerpc, and has been removed from this menu.  If you
+          wish to build a kernel for an Apple or CHRP machine, exit this
+          configuration process and re-run it with ARCH=powerpc.
 
-          Select CHRP/PReP if configuring for an IBM RS/6000 or
-          pSeries machine, or a PReP machine.
+          Select PReP if configuring for a PReP machine.
 
           Select Gemini if configuring for a Synergy Microsystems' Gemini
           series Single Board Computer.  More information is available at:
@@ -511,8 +552,8 @@ choice
           Select APUS if configuring for a PowerUP Amiga.  More information is
           available at: <http://linux-apus.sourceforge.net/>.
 
-config PPC_MULTIPLATFORM
-        bool "CHRP/PReP"
+config PPC_PREP
+        bool "PReP"
 
 config APUS
         bool "Amiga-APUS"
@@ -664,6 +705,13 @@ config LITE5200
           much but it's only been tested on this board version. I think this
           board is also known as IceCube.
 
+config LITE5200B
+        bool "Freescale LITE5200B"
+        depends LITE5200
+        help
+          Support for the LITE5200B dev board for the MPC5200 from Freescale.
+          This is the new board with 2 PCI slots.
+
 config MPC834x_SYS
         bool "Freescale MPC834x SYS"
         help
@@ -749,25 +797,6 @@ config CPM2
           you wish to build a kernel for a machine with a CPM2 coprocessor
           on it (826x, 827x, 8560).
 
-config PPC_CHRP
-        bool "Support for CHRP (Common Hardware Reference Platform) machines"
-        depends on PPC_MULTIPLATFORM
-        select PPC_I8259
-        select PPC_INDIRECT_PCI
-        default y
-
-config PPC_PREP
-        bool "Support for PReP (PowerPC Reference Platform) machines"
-        depends on PPC_MULTIPLATFORM
-        select PPC_I8259
-        select PPC_INDIRECT_PCI
-        default y
-
-config PPC_OF
-        bool
-        depends on PPC_CHRP
-        default y
-
 config PPC_GEN550
         bool
         depends on SANDPOINT || SPRUCE || PPLUS || \
@@ -926,14 +955,6 @@ source "mm/Kconfig"
 
 source "fs/Kconfig.binfmt"
 
-config PROC_DEVICETREE
-        bool "Support for Open Firmware device tree in /proc"
-        depends on PPC_OF && PROC_FS
-        help
-          This option adds a device-tree directory under /proc which contains
-          an image of the device tree that the kernel copies from Open
-          Firmware. If unsure, say Y here.
-
 config PREP_RESIDUAL
         bool "Support for PReP Residual Data"
         depends on PPC_PREP
@@ -1126,8 +1147,7 @@ menu "Bus options"
 
 config ISA
         bool "Support for ISA-bus hardware"
-        depends on PPC_PREP || PPC_CHRP
-        select PPC_I8259
+        depends on PPC_PREP
         help
           Find out whether you have ISA slots on your motherboard.  ISA is the
           name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -1137,18 +1157,18 @@ config ISA
 
 config GENERIC_ISA_DMA
         bool
-        depends on POWER3 || 6xx && !CPM2
+        depends on 6xx && !CPM2
         default y
 
 config PPC_I8259
         bool
-        default y if 85xx
+        default y if 85xx || PPC_PREP
         default n
 
 config PPC_INDIRECT_PCI
         bool
         depends on PCI
-        default y if 40x || 44x || 85xx || 83xx
+        default y if 40x || 44x || 85xx || 83xx || PPC_PREP
         default n
 
 config EISA
@@ -1339,7 +1359,7 @@ config CONSISTENT_SIZE
 
 config BOOT_LOAD_BOOL
         bool "Set the boot link/load address"
-        depends on ADVANCED_OPTIONS && !PPC_MULTIPLATFORM
+        depends on ADVANCED_OPTIONS && !PPC_PREP
         help
           This option allows you to set the initial load address of the zImage
           or zImage.initrd file.  This can be useful if you are on a board
diff --git a/arch/ppc/Kconfig.debug b/arch/ppc/Kconfig.debug
index 61653cb60c4e..f94b87740973 100644
--- a/arch/ppc/Kconfig.debug
+++ b/arch/ppc/Kconfig.debug
@@ -53,13 +53,6 @@ config BDI_SWITCH
           Unless you are intending to debug the kernel with one of these
           machines, say N here.
 
-config BOOTX_TEXT
-        bool "Support for early boot text console (BootX or OpenFirmware only)"
-        depends PPC_OF
-        help
-          Say Y here to see progress messages from the boot firmware in text
-          mode. Requires either BootX or Open Firmware.
-
 config SERIAL_TEXT_DEBUG
         bool "Support for early boot texts over serial port"
         depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \
@@ -67,7 +60,7 @@ config SERIAL_TEXT_DEBUG
 
 config PPC_OCP
         bool
-        depends on IBM_OCP || XILINX_OCP
+        depends on IBM_OCP
         default y
 
 endmenu
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 98e940beeb3b..0db66dcf0723 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -40,10 +40,8 @@ ifndef CONFIG_FSL_BOOKE
 CFLAGS          += -mstring
 endif
 
-cpu-as-$(CONFIG_PPC64BRIDGE)    += -Wa,-mppc64bridge
 cpu-as-$(CONFIG_4xx)            += -Wa,-m405
 cpu-as-$(CONFIG_6xx)            += -Wa,-maltivec
-cpu-as-$(CONFIG_POWER4)         += -Wa,-maltivec
 cpu-as-$(CONFIG_E500)           += -Wa,-me500
 cpu-as-$(CONFIG_E200)           += -Wa,-me200
 
@@ -59,8 +57,6 @@ head-$(CONFIG_4xx)		:= arch/ppc/kernel/head_4xx.o
 head-$(CONFIG_44x)              := arch/ppc/kernel/head_44x.o
 head-$(CONFIG_FSL_BOOKE)        := arch/ppc/kernel/head_fsl_booke.o
 
-head-$(CONFIG_6xx)              += arch/ppc/kernel/idle_6xx.o
-head-$(CONFIG_POWER4)           += arch/ppc/kernel/idle_power4.o
 head-$(CONFIG_PPC_FPU)          += arch/powerpc/kernel/fpu.o
 
 core-y                          += arch/ppc/kernel/ arch/powerpc/kernel/ \
@@ -71,7 +67,7 @@ core-y				+= arch/ppc/kernel/ arch/powerpc/kernel/ \
 core-$(CONFIG_4xx)              += arch/ppc/platforms/4xx/
 core-$(CONFIG_83xx)             += arch/ppc/platforms/83xx/
 core-$(CONFIG_85xx)             += arch/ppc/platforms/85xx/
-core-$(CONFIG_MATH_EMULATION)   += arch/ppc/math-emu/
+core-$(CONFIG_MATH_EMULATION)   += arch/powerpc/math-emu/
 core-$(CONFIG_XMON)             += arch/ppc/xmon/
 core-$(CONFIG_APUS)             += arch/ppc/amiga/
 drivers-$(CONFIG_8xx)           += arch/ppc/8xx_io/
@@ -82,7 +78,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/
 
 BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
 
-.PHONY: $(BOOT_TARGETS)
+PHONY += $(BOOT_TARGETS)
 
 all: uImage zImage
 
diff --git a/arch/ppc/amiga/amiints.c b/arch/ppc/amiga/amiints.c
index 5f35cf3986f7..b2bba052ab93 100644
--- a/arch/ppc/amiga/amiints.c
+++ b/arch/ppc/amiga/amiints.c
@@ -1,5 +1,5 @@
 /*
- * arch/ppc/amiga/amiints.c -- Amiga Linux interrupt handling code
+ * Amiga Linux interrupt handling code
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file COPYING in the main directory of this archive
diff --git a/arch/ppc/amiga/bootinfo.c b/arch/ppc/amiga/bootinfo.c
index e2e965661d03..efd869a3ed9b 100644
--- a/arch/ppc/amiga/bootinfo.c
+++ b/arch/ppc/amiga/bootinfo.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/amiga/bootinfo.c
- *
  *  Extracted from arch/m68k/kernel/setup.c.
  *  Should be properly generalized and put somewhere else.
  *                              Jesper
diff --git a/arch/ppc/amiga/cia.c b/arch/ppc/amiga/cia.c
index 4431c58f611a..9558f2f40e64 100644
--- a/arch/ppc/amiga/cia.c
+++ b/arch/ppc/amiga/cia.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/amiga/cia.c - CIA support
- *
  *  Copyright (C) 1996 Roman Zippel
  *
  *  The concept of some functions bases on the original Amiga OS function
diff --git a/arch/ppc/amiga/config.c b/arch/ppc/amiga/config.c
index 60e2da1c92c0..bbe47c9bd707 100644
--- a/arch/ppc/amiga/config.c
+++ b/arch/ppc/amiga/config.c
@@ -1,8 +1,6 @@
 #define m68k_debug_device debug_device
 
 /*
- *  arch/ppc/amiga/config.c
- *
  *  Copyright (C) 1993 Hamish Macdonald
  *
  * This file is subject to the terms and conditions of the GNU General Public
diff --git a/arch/ppc/amiga/ints.c b/arch/ppc/amiga/ints.c
index 5d318e498f06..083a17462190 100644
--- a/arch/ppc/amiga/ints.c
+++ b/arch/ppc/amiga/ints.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/amiga/ints.c
- *
  *  Linux/m68k general interrupt handling code from arch/m68k/kernel/ints.c
  *  Needed to drive the m68k emulating IRQ hardware on the PowerUp boards.
  */
diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile
index efd8ce515d5f..b739e25d4728 100644
--- a/arch/ppc/boot/Makefile
+++ b/arch/ppc/boot/Makefile
@@ -1,6 +1,9 @@
 #
 # arch/ppc/boot/Makefile
 #
+# This file is included by the global makefile so that you can add your own
+# architecture-specific flags and dependencies.
+#
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
 # for more details.
@@ -16,16 +19,15 @@ HOSTCFLAGS	+= -Iarch/$(ARCH)/boot/include
 BOOT_TARGETS    = zImage zImage.initrd znetboot znetboot.initrd
 
 bootdir-y                       := simple
-bootdir-$(CONFIG_PPC_OF)        += openfirmware
 subdir-y                        := lib common images
-subdir-$(CONFIG_PPC_MULTIPLATFORM)      += of1275
+subdir-$(CONFIG_PPC_PREP)       += of1275
 
 # for cleaning
-subdir-                         += simple openfirmware
+subdir-                         += simple
 
-hostprogs-y := $(addprefix utils/, addnote mknote hack-coff mkprep mkbugboot mktree)
+hostprogs-y := $(addprefix utils/, mkprep mkbugboot mktree)
 
-.PHONY: $(BOOT_TARGETS) $(bootdir-y)
+PHONY += $(BOOT_TARGETS) $(bootdir-y)
 
 $(BOOT_TARGETS): $(bootdir-y)
 
diff --git a/arch/ppc/boot/common/Makefile b/arch/ppc/boot/common/Makefile
index f88d647d5dd4..a2e85e3beb88 100644
--- a/arch/ppc/boot/common/Makefile
+++ b/arch/ppc/boot/common/Makefile
@@ -1,6 +1,3 @@
-#
-# arch/ppc/boot/common/Makefile
-#
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
 # for more details.
diff --git a/arch/ppc/boot/common/bootinfo.c b/arch/ppc/boot/common/bootinfo.c
index 9c6e528940e9..f4dc9b9fab9c 100644
--- a/arch/ppc/boot/common/bootinfo.c
+++ b/arch/ppc/boot/common/bootinfo.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/common/bootinfo.c
- *
  * General bootinfo record utilities
  * Author: Randy Vinson <rvinson@mvista.com>
  *
diff --git a/arch/ppc/boot/common/misc-common.c b/arch/ppc/boot/common/misc-common.c
index e79e6b3f276e..073830a8559a 100644
--- a/arch/ppc/boot/common/misc-common.c
+++ b/arch/ppc/boot/common/misc-common.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/common/misc-common.c
- *
  * Misc. bootloader code (almost) all platforms can use
  *
  * Author: Johnnie Peters <jpeters@mvista.com>
diff --git a/arch/ppc/boot/common/ns16550.c b/arch/ppc/boot/common/ns16550.c
index 26818bbb6cff..4f00c93ac870 100644
--- a/arch/ppc/boot/common/ns16550.c
+++ b/arch/ppc/boot/common/ns16550.c
@@ -8,6 +8,9 @@
 #include <linux/serial_reg.h>
 #include <asm/serial.h>
 
+#if defined(CONFIG_XILINX_VIRTEX)
+#include <platforms/4xx/xparameters/xparameters.h>
+#endif
 #include "nonstdio.h"
 #include "serial.h"
 
diff --git a/arch/ppc/boot/common/serial_stub.c b/arch/ppc/boot/common/serial_stub.c
index 03dfaa01fa63..5cc9ae66a8ba 100644
--- a/arch/ppc/boot/common/serial_stub.c
+++ b/arch/ppc/boot/common/serial_stub.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/common/serial_stub.c
- *
  * This is a few stub routines to make the boot code cleaner looking when
  * there is no serial port support doesn't need to be closed, for example.
  *
diff --git a/arch/ppc/boot/common/util.S b/arch/ppc/boot/common/util.S
index 368ec035e6cd..0c5e43c4ae06 100644
--- a/arch/ppc/boot/common/util.S
+++ b/arch/ppc/boot/common/util.S
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/common/util.S
- *
  * Useful bootup functions, which are more easily done in asm than C.
  *
  * NOTE:  Be very very careful about the registers you use here.
diff --git a/arch/ppc/boot/include/mpc10x.h b/arch/ppc/boot/include/mpc10x.h
index 6cd40ecabc74..6e5d540d8d3e 100644
--- a/arch/ppc/boot/include/mpc10x.h
+++ b/arch/ppc/boot/include/mpc10x.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/include/mpc10.h
- *
  * Common defines for the Motorola SPS MPC106/8240/107 Host bridge/Mem
  * ctrl/EPIC/etc.
  *
diff --git a/arch/ppc/boot/openfirmware/Makefile b/arch/ppc/boot/openfirmware/Makefile
deleted file mode 100644
index 2a411ec2e650..000000000000
--- a/arch/ppc/boot/openfirmware/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-# Makefile for making bootable images on various OpenFirmware machines.
-#
-# Paul Mackerras        January 1997
-#       XCOFF bootable images for PowerMacs
-# Geert Uytterhoeven    September 1997
-#       ELF bootable iamges for CHRP machines.
-# Tom Rini              January 2001
-#       Cleaned up, moved into arch/ppc/boot/pmac
-# Tom Rini              July/August 2002
-#       Merged 'chrp' and 'pmac' into 'openfirmware', and cleaned up the
-#       rules.
-
-zImage.initrd znetboot.initrd: del-ramdisk-sec  := -R .ramdisk
-zImage.initrd znetboot.initrd: initrd           := .initrd
-
-
-boot    := arch/ppc/boot
-common  := $(boot)/common
-utils   := $(boot)/utils
-bootlib := $(boot)/lib
-of1275  := $(boot)/of1275
-images  := $(boot)/images
-
-CHRP_LD_ARGS    := -T $(srctree)/$(boot)/ld.script -e _start -Ttext 0x00800000
-
-COMMONOBJS      := start.o misc.o common.o
-CHRPOBJS        := crt0.o     $(COMMONOBJS) chrpmain.o
-
-targets         := $(CHRPOBJS) dummy.o
-CHRPOBJS        := $(addprefix $(obj)/, $(CHRPOBJS))
-
-LIBS            := lib/lib.a $(bootlib)/lib.a $(of1275)/lib.a $(common)/lib.a
-
-ifdef CONFIG_SMP
-END := .smp
-endif
-ifdef CONFIG_PPC64BRIDGE
-END += .64
-endif
-
-
-$(images)/ramdisk.image.gz:
-        @echo '  MISSING $@'
-        @echo '          RAM disk image must be provided separately'
-        @/bin/false
-
-quiet_cmd_genimage = GEN     $@
-      cmd_genimage = $(OBJCOPY) -R .comment       \
-        --add-section=.image=$(images)/vmlinux.gz \
-        --set-section-flags=.image=contents,alloc,load,readonly,data $< $@
-
-targets += image.o
-$(obj)/image.o: $(obj)/dummy.o $(images)/vmlinux.gz FORCE
-        $(call if_changed,genimage)
-
-# Place the ramdisk in the initrd image.
-quiet_cmd_genimage-initrd = GEN     $@
-      cmd_genimage-initrd = $(OBJCOPY) $< $@ \
-        --add-section=.ramdisk=$(images)/ramdisk.image.gz \
-        --set-section-flags=.ramdisk=contents,alloc,load,readonly,data
-targets += image.initrd.o
-$(obj)/image.initrd.o: $(obj)/image.o $(images)/ramdisk.image.gz FORCE
-        $(call if_changed,genimage-initrd)
-
-
-targets += crt0.o
-$(obj)/crt0.o: $(common)/crt0.S FORCE
-        $(call if_changed_dep,as_o_S)
-
-quiet_cmd_gen-chrp = CHRP    $@
-      cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $(CHRPOBJS) $< $(LIBS) && \
-                        $(OBJCOPY) $@ $@ -R .comment $(del-ramdisk-sec)
-
-$(images)/zImage.chrp: $(obj)/image.o $(CHRPOBJS) $(LIBS) \
-                                   $(srctree)/$(boot)/ld.script
-        $(call cmd,gen-chrp)
-$(images)/zImage.initrd.chrp: $(obj)/image.initrd.o $(CHRPOBJS) $(LIBS) \
-                                   $(srctree)/$(boot)/ld.script
-        $(call cmd,gen-chrp)
-
-quiet_cmd_addnote = ADDNOTE $@
-      cmd_addnote = cat $< > $@ && $(utils)/addnote $@
-$(images)/zImage.chrp-rs6k $(images)/zImage.initrd.chrp-rs6k: \
-        %-rs6k: %
-        $(call cmd,addnote)
-
-# The targets used on the make command-line
-
-.PHONY: zImage zImage.initrd
-zImage:          $(images)/zImage.chrp          \
-                 $(images)/zImage.chrp-rs6k
-        @echo '  kernel: $@ is ready ($<)'
-zImage.initrd:   $(images)/zImage.initrd.chrp           \
-                 $(images)/zImage.initrd.chrp-rs6k
-        @echo '  kernel: $@ is ready ($<)'
-
-TFTPIMAGE       := /tftpboot/zImage
-
-.PHONY: znetboot znetboot.initrd
-znetboot:       $(images)/zImage.chrp
-        cp $(images)/zImage.chrp      $(TFTPIMAGE).chrp$(END)
-        @echo '  kernel: $@ is ready ($<)'
-znetboot.initrd:$(images)/zImage.initrd.chrp
-        cp $(images)/zImage.initrd.chrp      $(TFTPIMAGE).chrp$(END)
-        @echo '  kernel: $@ is ready ($<)'
-
diff --git a/arch/ppc/boot/openfirmware/chrpmain.c b/arch/ppc/boot/openfirmware/chrpmain.c
deleted file mode 100644
index 245dbd9fc120..000000000000
--- a/arch/ppc/boot/openfirmware/chrpmain.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) Paul Mackerras 1997.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <linux/string.h>
-#include "nonstdio.h"
-#include "of1275.h"
-#include <asm/processor.h>
-#include <asm/page.h>
-
-/* Passed from the linker */
-extern char __image_begin, __image_end;
-extern char __ramdisk_begin, __ramdisk_end;
-extern char _start, _end;
-
-extern unsigned int heap_max;
-extern void flush_cache(void *, unsigned long);
-extern void gunzip(void *, int, unsigned char *, int *);
-extern void make_bi_recs(unsigned long addr, char *name, unsigned int mach,
-                unsigned int progend);
-
-char *avail_ram;
-char *begin_avail, *end_avail;
-char *avail_high;
-
-#define RAM_START       0x00000000
-#define RAM_END         (64<<20)
-
-#define BOOT_START      ((unsigned long)_start)
-#define BOOT_END        ((unsigned long)(_end + 0xFFF) & ~0xFFF)
-
-#define RAM_FREE        ((unsigned long)(_end+0x1000)&~0xFFF)
-#define PROG_START      0x00010000
-#define PROG_SIZE       0x007f0000 /* 8MB */
-
-#define SCRATCH_SIZE    (128 << 10)
-
-static char scratch[SCRATCH_SIZE];      /* 128k of scratch space for gunzip */
-
-typedef void (*kernel_start_t)(int, int, void *, unsigned int, unsigned int);
-
-void
-boot(int a1, int a2, void *prom)
-{
-    unsigned sa, len;
-    void *dst;
-    unsigned char *im;
-    unsigned int initrd_size, initrd_start;
-
-    printf("chrpboot starting: loaded at 0x%p\n\r", &_start);
-
-    initrd_size = &__ramdisk_end - &__ramdisk_begin;
-    if (initrd_size) {
-        initrd_start = (RAM_END - initrd_size) & ~0xFFF;
-        a1 = initrd_start;
-        a2 = initrd_size;
-        claim(initrd_start, RAM_END - initrd_start, 0);
-        printf("initial ramdisk moving 0x%x <- 0x%p (%x bytes)\n\r",
-               initrd_start, &__ramdisk_begin, initrd_size);
-        memcpy((char *)initrd_start, &__ramdisk_begin, initrd_size);
-    } else {
-        initrd_start = 0;
-        initrd_size = 0;
-        a2 = 0xdeadbeef;
-    }
-
-    im = &__image_begin;
-    len = &__image_end - &__image_begin;
-    /* claim 4MB starting at PROG_START */
-    claim(PROG_START, PROG_SIZE - PROG_START, 0);
-    dst = (void *) PROG_START;
-    if (im[0] == 0x1f && im[1] == 0x8b) {
-        avail_ram = scratch;
-        begin_avail = avail_high = avail_ram;
-        end_avail = scratch + sizeof(scratch);
-        printf("gunzipping (0x%p <- 0x%p:0x%p)...", dst, im, im+len);
-        gunzip(dst, PROG_SIZE - PROG_START, im, &len);
-        printf("done %u bytes\n\r", len);
-        printf("%u bytes of heap consumed, max in use %u\n\r",
-               avail_high - begin_avail, heap_max);
-    } else {
-        memmove(dst, im, len);
-    }
-
-    flush_cache(dst, len);
-    make_bi_recs(((unsigned long) dst + len), "chrpboot", _MACH_chrp,
-                    (PROG_START + PROG_SIZE));
-
-    sa = PROG_START;
-    printf("start address = 0x%x\n\r", sa);
-
-    (*(kernel_start_t)sa)(a1, a2, prom, initrd_start, initrd_size);
-
-    printf("returned?\n\r");
-
-    pause();
-}
diff --git a/arch/ppc/boot/openfirmware/common.c b/arch/ppc/boot/openfirmware/common.c
deleted file mode 100644
index 0f46756a903e..000000000000
--- a/arch/ppc/boot/openfirmware/common.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) Paul Mackerras 1997.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include "nonstdio.h"
-#include "of1275.h"
-#include <linux/string.h>
-#include <linux/zlib.h>
-#include <asm/bootinfo.h>
-#include <asm/page.h>
-
-/* Information from the linker */
-
-extern int strcmp(const char *s1, const char *s2);
-extern char *avail_ram, *avail_high;
-extern char *end_avail;
-
-unsigned int heap_use, heap_max;
-
-struct memchunk {
-    unsigned int size;
-    struct memchunk *next;
-};
-
-static struct memchunk *freechunks;
-
-static void *zalloc(unsigned size)
-{
-    void *p;
-    struct memchunk **mpp, *mp;
-
-    size = (size + 7) & -8;
-    heap_use += size;
-    if (heap_use > heap_max)
-        heap_max = heap_use;
-    for (mpp = &freechunks; (mp = *mpp) != 0; mpp = &mp->next) {
-        if (mp->size == size) {
-            *mpp = mp->next;
-            return mp;
-        }
-    }
-    p = avail_ram;
-    avail_ram += size;
-    if (avail_ram > avail_high)
-        avail_high = avail_ram;
-    if (avail_ram > end_avail) {
-        printf("oops... out of memory\n\r");
-        pause();
-    }
-    return p;
-}
-
-#define HEAD_CRC        2
-#define EXTRA_FIELD     4
-#define ORIG_NAME       8
-#define COMMENT         0x10
-#define RESERVED        0xe0
-
-void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
-{
-        z_stream s;
-        int r, i, flags;
-
-        /* skip header */
-        i = 10;
-        flags = src[3];
-        if (src[2] != Z_DEFLATED || (flags & RESERVED) != 0) {
-                printf("bad gzipped data\n\r");
-                exit();
-        }
-        if ((flags & EXTRA_FIELD) != 0)
-                i = 12 + src[10] + (src[11] << 8);
-        if ((flags & ORIG_NAME) != 0)
-                while (src[i++] != 0)
-                        ;
-        if ((flags & COMMENT) != 0)
-                while (src[i++] != 0)
-                        ;
-        if ((flags & HEAD_CRC) != 0)
-                i += 2;
-        if (i >= *lenp) {
-                printf("gunzip: ran out of data in header\n\r");
-                exit();
-        }
-
-        /* Initialize ourself. */
-        s.workspace = zalloc(zlib_inflate_workspacesize());
-        r = zlib_inflateInit2(&s, -MAX_WBITS);
-        if (r != Z_OK) {
-                printf("zlib_inflateInit2 returned %d\n\r", r);
-                exit();
-        }
-        s.next_in = src + i;
-        s.avail_in = *lenp - i;
-        s.next_out = dst;
-        s.avail_out = dstlen;
-        r = zlib_inflate(&s, Z_FINISH);
-        if (r != Z_OK && r != Z_STREAM_END) {
-                printf("inflate returned %d msg: %s\n\r", r, s.msg);
-                exit();
-        }
-        *lenp = s.next_out - (unsigned char *) dst;
-        zlib_inflateEnd(&s);
-}
-
-/* Make a bi_rec in OF.  We need to be passed a name for BI_BOOTLOADER_ID,
- * a machine type for BI_MACHTYPE, and the location where the end of the
- * bootloader is (PROG_START + PROG_SIZE)
- */
-void make_bi_recs(unsigned long addr, char *name, unsigned int mach,
-                unsigned long progend)
-{
-        struct bi_record *rec;
-
-
-        /* leave a 1MB gap then align to the next 1MB boundary */
-        addr = _ALIGN(addr+ (1<<20) - 1, (1<<20));
-        /* oldworld machine seem very unhappy about this. -- Tom */
-        if (addr >= progend)
-                claim(addr, 0x1000, 0);
-
-        rec = (struct bi_record *)addr;
-        rec->tag = BI_FIRST;
-        rec->size = sizeof(struct bi_record);
-        rec = (struct bi_record *)((unsigned long)rec + rec->size);
-
-        rec->tag = BI_BOOTLOADER_ID;
-        sprintf( (char *)rec->data, name);
-        rec->size = sizeof(struct bi_record) + strlen(name) + 1;
-        rec = (struct bi_record *)((unsigned long)rec + rec->size);
-
-        rec->tag = BI_MACHTYPE;
-        rec->data[0] = mach;
-        rec->data[1] = 1;
-        rec->size = sizeof(struct bi_record) + 2 * sizeof(unsigned long);
-        rec = (struct bi_record *)((unsigned long)rec + rec->size);
-
-        rec->tag = BI_LAST;
-        rec->size = sizeof(struct bi_record);
-        rec = (struct bi_record *)((unsigned long)rec + rec->size);
-}
diff --git a/arch/ppc/boot/openfirmware/dummy.c b/arch/ppc/boot/openfirmware/dummy.c
deleted file mode 100644
index 31dbf45bf99c..000000000000
--- a/arch/ppc/boot/openfirmware/dummy.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int main(void)
-{
-        return 0;
-}
diff --git a/arch/ppc/boot/openfirmware/misc.S b/arch/ppc/boot/openfirmware/misc.S
deleted file mode 100644
index ab9e897cadd0..000000000000
--- a/arch/ppc/boot/openfirmware/misc.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) Paul Mackerras 1997.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-        .text
-
-/*
- * Use the BAT2 & 3 registers to map the 1st 16MB of RAM to
- * the address given as the 1st argument.
- */
-        .globl  setup_bats
-setup_bats:
-        mfpvr   5
-        rlwinm  5,5,16,16,31            /* r3 = 1 for 601, 4 for 604 */
-        cmpwi   0,5,1
-        li      0,0
-        bne     4f
-        mtibatl 3,0                     /* invalidate BAT first */
-        ori     3,3,4                   /* set up BAT registers for 601 */
-        li      4,0x7f
-        mtibatu 2,3
-        mtibatl 2,4
-        oris    3,3,0x80
-        oris    4,4,0x80
-        mtibatu 3,3
-        mtibatl 3,4
-        b       5f
-4:      mtdbatu 3,0                     /* invalidate BATs first */
-        mtibatu 3,0
-        ori     3,3,0xff                /* set up BAT registers for 604 */
-        li      4,2
-        mtdbatl 2,4
-        mtdbatu 2,3
-        mtibatl 2,4
-        mtibatu 2,3
-        oris    3,3,0x80
-        oris    4,4,0x80
-        mtdbatl 3,4
-        mtdbatu 3,3
-        mtibatl 3,4
-        mtibatu 3,3
-5:      sync
-        isync
-        blr
-
-/*
- * Flush the dcache and invalidate the icache for a range of addresses.
- *
- * flush_cache(addr, len)
- */
-        .global flush_cache
-flush_cache:
-        addi    4,4,0x1f        /* len = (len + 0x1f) / 0x20 */
-        rlwinm. 4,4,27,5,31
-        mtctr   4
-        beqlr
-1:      dcbf    0,3
-        icbi    0,3
-        addi    3,3,0x20
-        bdnz    1b
-        sync
-        isync
-        blr
diff --git a/arch/ppc/boot/openfirmware/start.c b/arch/ppc/boot/openfirmware/start.c
deleted file mode 100644
index 1617a26956bf..000000000000
--- a/arch/ppc/boot/openfirmware/start.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) Paul Mackerras 1997.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <stdarg.h>
-#include "of1275.h"
-
-extern int strlen(const char *s);
-extern void boot(int a1, int a2, void *prom);
-
-phandle stdin;
-phandle stdout;
-phandle stderr;
-
-void printk(char *fmt, ...);
-
-void
-start(int a1, int a2, void *promptr)
-{
-    ofinit(promptr);
-    if (ofstdio(&stdin, &stdout, &stderr))
-        exit();
-
-    boot(a1, a2, promptr);
-    for (;;)
-        exit();
-}
-
-int writestring(void *f, char *ptr, int nb)
-{
-        int w = 0, i;
-        char *ret = "\r";
-
-        for (i = 0; i < nb; ++i) {
-                if (ptr[i] == '\n') {
-                        if (i > w) {
-                                write(f, ptr + w, i - w);
-                                w = i;
-                        }
-                        write(f, ret, 1);
-                }
-        }
-        if (w < nb)
-                write(f, ptr + w, nb - w);
-        return nb;
-}
-
-int
-putc(int c, void *f)
-{
-    char ch = c;
-
-    return writestring(f, &ch, 1) == 1? c: -1;
-}
-
-int
-putchar(int c)
-{
-    return putc(c, stdout);
-}
-
-int
-fputs(char *str, void *f)
-{
-    int n = strlen(str);
-
-    return writestring(f, str, n) == n? 0: -1;
-}
-
-int
-readchar(void)
-{
-    char ch;
-
-    for (;;) {
-        switch (read(stdin, &ch, 1)) {
-        case 1:
-            return ch;
-        case -1:
-            printk("read(stdin) returned -1\n");
-            return -1;
-        }
-    }
-}
-
-static char line[256];
-static char *lineptr;
-static int lineleft;
-
-int
-getchar(void)
-{
-    int c;
-
-    if (lineleft == 0) {
-        lineptr = line;
-        for (;;) {
-            c = readchar();
-            if (c == -1 || c == 4)
-                break;
-            if (c == '\r' || c == '\n') {
-                *lineptr++ = '\n';
-                putchar('\n');
-                break;
-            }
-            switch (c) {
-            case 0177:
-            case '\b':
-                if (lineptr > line) {
-                    putchar('\b');
-                    putchar(' ');
-                    putchar('\b');
-                    --lineptr;
-                }
-                break;
-            case 'U' & 0x1F:
-                while (lineptr > line) {
-                    putchar('\b');
-                    putchar(' ');
-                    putchar('\b');
-                    --lineptr;
-                }
-                break;
-            default:
-                if (lineptr >= &line[sizeof(line) - 1])
-                    putchar('\a');
-                else {
-                    putchar(c);
-                    *lineptr++ = c;
-                }
-            }
-        }
-        lineleft = lineptr - line;
-        lineptr = line;
-    }
-    if (lineleft == 0)
-        return -1;
-    --lineleft;
-    return *lineptr++;
-}
-
-extern int vsprintf(char *buf, const char *fmt, va_list args);
-static char sprint_buf[1024];
-
-void
-printk(char *fmt, ...)
-{
-        va_list args;
-        int n;
-
-        va_start(args, fmt);
-        n = vsprintf(sprint_buf, fmt, args);
-        va_end(args);
-        writestring(stdout, sprint_buf, n);
-}
-
-int
-printf(char *fmt, ...)
-{
-        va_list args;
-        int n;
-
-        va_start(args, fmt);
-        n = vsprintf(sprint_buf, fmt, args);
-        va_end(args);
-        writestring(stdout, sprint_buf, n);
-        return n;
-}
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index 9533f8de238f..28be01b99c44 100644
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -192,6 +192,7 @@ boot-$(CONFIG_8xx)		+= embed_config.o
 boot-$(CONFIG_8260)             += embed_config.o
 boot-$(CONFIG_EP405)            += embed_config.o
 boot-$(CONFIG_XILINX_ML300)     += embed_config.o
+boot-$(CONFIG_XILINX_ML403)     += embed_config.o
 boot-$(CONFIG_BSEIP)            += iic.o
 boot-$(CONFIG_MBX)              += iic.o pci.o qspan_pci.o
 boot-$(CONFIG_MV64X60)          += misc-mv64x60.o
diff --git a/arch/ppc/boot/simple/cpc700_memory.c b/arch/ppc/boot/simple/cpc700_memory.c
index 8c75cf6c2383..d75420a45a59 100644
--- a/arch/ppc/boot/simple/cpc700_memory.c
+++ b/arch/ppc/boot/simple/cpc700_memory.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/common/cpc700_memory.c
- *
  * Find memory based upon settings in the CPC700 bridge
  *
  * Author: Dan Cox
diff --git a/arch/ppc/boot/simple/embed_config.c b/arch/ppc/boot/simple/embed_config.c
index 491a691d10cc..3a51b1062940 100644
--- a/arch/ppc/boot/simple/embed_config.c
+++ b/arch/ppc/boot/simple/embed_config.c
@@ -21,6 +21,9 @@
 #ifdef CONFIG_40x
 #include <asm/io.h>
 #endif
+#ifdef CONFIG_XILINX_VIRTEX
+#include <platforms/4xx/xparameters/xparameters.h>
+#endif
 extern unsigned long timebase_period_ns;
 
 /* For those boards that don't provide one.
@@ -742,7 +745,7 @@ embed_config(bd_t **bdp)
 }
 #endif /* WILLOW */
 
-#ifdef CONFIG_XILINX_ML300
+#if defined(CONFIG_XILINX_ML300) || defined(CONFIG_XILINX_ML403)
 void
 embed_config(bd_t ** bdp)
 {
@@ -779,7 +782,7 @@ embed_config(bd_t ** bdp)
         timebase_period_ns = 1000000000 / bd->bi_tbfreq;
         /* see bi_tbfreq definition in arch/ppc/platforms/4xx/xilinx_ml300.h */
 }
-#endif /* CONFIG_XILINX_ML300 */
+#endif /* CONFIG_XILINX_ML300 || CONFIG_XILINX_ML403 */
 
 #ifdef CONFIG_IBM_OPENBIOS
 /* This could possibly work for all treeboot roms.
diff --git a/arch/ppc/boot/simple/head.S b/arch/ppc/boot/simple/head.S
index 5e4adc298bf9..160da1006ff8 100644
--- a/arch/ppc/boot/simple/head.S
+++ b/arch/ppc/boot/simple/head.S
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/head.S
- *
  * Initial board bringup code for many different boards.
  *
  * Author: Tom Rini
@@ -65,6 +63,13 @@ start_:
                          */
 #endif
 
+#if defined(CONFIG_XILINX_VIRTEX_4_FX)
+        /* PPC errata 213: only for Virtex-4 FX */
+        mfccr0  0
+        oris    0,0,0x50000000@h
+        mtccr0  0
+#endif
+
         mflr    r3      /* Save our actual starting address. */
 
         /* The following functions we call must not modify r3 or r4.....
diff --git a/arch/ppc/boot/simple/misc-chestnut.c b/arch/ppc/boot/simple/misc-chestnut.c
index 0dce7f3557e4..b94e142ad892 100644
--- a/arch/ppc/boot/simple/misc-chestnut.c
+++ b/arch/ppc/boot/simple/misc-chestnut.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/misc-chestnut.c
- *
  * Setup for the IBM Chestnut (ibm-750fxgx_eval)
  *
  * Author: Mark A. Greer <mgreer@mvista.com>
diff --git a/arch/ppc/boot/simple/misc-cpci690.c b/arch/ppc/boot/simple/misc-cpci690.c
index 26860300fa09..8a8614d11a32 100644
--- a/arch/ppc/boot/simple/misc-cpci690.c
+++ b/arch/ppc/boot/simple/misc-cpci690.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/misc-cpci690.c
- *
  * Add birec data for Force CPCI690 board.
  *
  * Author: Mark A. Greer <source@mvista.com>
diff --git a/arch/ppc/boot/simple/misc-ev64260.c b/arch/ppc/boot/simple/misc-ev64260.c
index 52ece6937a7a..2678c224af22 100644
--- a/arch/ppc/boot/simple/misc-ev64260.c
+++ b/arch/ppc/boot/simple/misc-ev64260.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/misc-ev64260.c
- *
  * Host bridge init code for the Marvell/Galileo EV-64260-BP evaluation board
  * with a GT64260 onboard.
  *
diff --git a/arch/ppc/boot/simple/misc-ev64360.c b/arch/ppc/boot/simple/misc-ev64360.c
index cd1ccf2a1582..a212b5b988cb 100644
--- a/arch/ppc/boot/simple/misc-ev64360.c
+++ b/arch/ppc/boot/simple/misc-ev64360.c
@@ -1,5 +1,4 @@
 /*
- * arch/ppc/boot/simple/misc-ev64360.c
  * Copyright (C) 2005 Lee Nicks <allinux@gmail.com>
  *
  * Based on arch/ppc/boot/simple/misc-katana.c from:
diff --git a/arch/ppc/boot/simple/misc-katana.c b/arch/ppc/boot/simple/misc-katana.c
index ec94a11bacac..d97f2ee6f04e 100644
--- a/arch/ppc/boot/simple/misc-katana.c
+++ b/arch/ppc/boot/simple/misc-katana.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/misc-katana.c
- *
  * Set up MPSC values to bootwrapper can prompt user.
  *
  * Author: Mark A. Greer <source@mvista.com>
diff --git a/arch/ppc/boot/simple/misc-mv64x60.c b/arch/ppc/boot/simple/misc-mv64x60.c
index 258d4599fadc..71ff20fd494a 100644
--- a/arch/ppc/boot/simple/misc-mv64x60.c
+++ b/arch/ppc/boot/simple/misc-mv64x60.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/misc-mv64x60.c
- *
  * Relocate bridge's register base and call board specific routine.
  *
  * Author: Mark A. Greer <source@mvista.com>
diff --git a/arch/ppc/boot/simple/misc-prep.c b/arch/ppc/boot/simple/misc-prep.c
index 75380ac41669..63def9d13d70 100644
--- a/arch/ppc/boot/simple/misc-prep.c
+++ b/arch/ppc/boot/simple/misc-prep.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/misc-prep.c
- *
  * Maintainer: Tom Rini <trini@kernel.crashing.org>
  *
  * In the past: Gary Thomas, Cort Dougan <cort@cs.nmt.edu>
diff --git a/arch/ppc/boot/simple/misc-radstone_ppc7d.c b/arch/ppc/boot/simple/misc-radstone_ppc7d.c
index 569e0d4feeaf..0f302ea9c3d1 100644
--- a/arch/ppc/boot/simple/misc-radstone_ppc7d.c
+++ b/arch/ppc/boot/simple/misc-radstone_ppc7d.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/misc-radstone_ppc7d.c
- *
  * Misc data for Radstone PPC7D board.
  *
  * Author: James Chapman <jchapman@katalix.com>
diff --git a/arch/ppc/boot/simple/misc-spruce.c b/arch/ppc/boot/simple/misc-spruce.c
index d012c39278fd..0cad2f557a1e 100644
--- a/arch/ppc/boot/simple/misc-spruce.c
+++ b/arch/ppc/boot/simple/misc-spruce.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/spruce/misc.c
- *
  * Misc. bootloader code for IBM Spruce reference platform
  *
  * Authors: Johnnie Peters <jpeters@mvista.com>
diff --git a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c
index f415d6c62362..3d78571ad945 100644
--- a/arch/ppc/boot/simple/misc.c
+++ b/arch/ppc/boot/simple/misc.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/simple/misc.c
- *
  * Misc. bootloader code for many machines.  This assumes you have are using
  * a 6xx/7xx/74xx CPU in your machine.  This assumes the chunk of memory
  * below 8MB is free.  Finally, it assumes you have a NS16550-style uart for
diff --git a/arch/ppc/boot/simple/mpc10x_memory.c b/arch/ppc/boot/simple/mpc10x_memory.c
index 20d92a34ceb8..8da8f576031d 100644
--- a/arch/ppc/boot/simple/mpc10x_memory.c
+++ b/arch/ppc/boot/simple/mpc10x_memory.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/common/mpc10x_common.c
- *
  * A routine to find out how much memory the machine has.
  *
  * Based on:
@@ -52,10 +50,10 @@ MPC10X_PCI_OP(read, dword, u32 *, in_le32, 0)
  * the system.  This assumes that the firmware has correctly set up the memory
  * controller registers.  On CONFIG_PPC_PREP, we know we are being called
  * under a PReP memory map. On all other machines, we assume we are under
- * a CHRP memory map.  Further, on CONFIG_PPC_MULTIPLATFORM we must rename
+ * a CHRP memory map.  Further, on CONFIG_PPC_PREP we must rename
  * this function.
  */
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_PREP
 #define get_mem_size mpc10x_get_mem_size
 #endif
 unsigned long
diff --git a/arch/ppc/boot/simple/mpc52xx_tty.c b/arch/ppc/boot/simple/mpc52xx_tty.c
index 3acc6b7c0727..1964493cf3bd 100644
--- a/arch/ppc/boot/simple/mpc52xx_tty.c
+++ b/arch/ppc/boot/simple/mpc52xx_tty.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/mpc52xx_tty.c
- *
  * Minimal serial functions needed to send messages out a MPC52xx
  * Programmable Serial Controller (PSC).
  *
diff --git a/arch/ppc/boot/simple/mv64x60_tty.c b/arch/ppc/boot/simple/mv64x60_tty.c
index b9c24d4c738b..0c52f5c784a2 100644
--- a/arch/ppc/boot/simple/mv64x60_tty.c
+++ b/arch/ppc/boot/simple/mv64x60_tty.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/mv64x60_tty.c
- *
  * Bootloader version of the embedded MPSC/UART driver for the Marvell 64x60.
  * Note: Due to a GT64260A erratum, DMA will be used for UART input (via SDMA).
  *
diff --git a/arch/ppc/boot/simple/openbios.c b/arch/ppc/boot/simple/openbios.c
index 81f11d8b30a7..3f2ed53f793a 100644
--- a/arch/ppc/boot/simple/openbios.c
+++ b/arch/ppc/boot/simple/openbios.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/openbios.c
- *
  * Copyright (c) 2005 DENX Software Engineering
  * Stefan Roese <sr@denx.de>
  *
diff --git a/arch/ppc/boot/simple/relocate.S b/arch/ppc/boot/simple/relocate.S
index 555a216ccc49..2533113c1cc5 100644
--- a/arch/ppc/boot/simple/relocate.S
+++ b/arch/ppc/boot/simple/relocate.S
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/relocate.S
- *
  * This is the common part of the loader relocation and initialization
  * process.  All of the board/processor specific initialization is
  * done before we get here.
@@ -196,7 +194,7 @@ start_ldr:
         /*
          * Start at the begining.
          */
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_PREP
         li      r9,0xc
         mtlr    r9
         /* tell kernel we're prep, by putting 0xdeadc0de at KERNELLOAD,
diff --git a/arch/ppc/boot/utils/addnote.c b/arch/ppc/boot/utils/addnote.c
deleted file mode 100644
index 6c52b18f2d04..000000000000
--- a/arch/ppc/boot/utils/addnote.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Program to hack in a PT_NOTE program header entry in an ELF file.
- * This is needed for OF on RS/6000s to load an image correctly.
- * Note that OF needs a program header entry for the note, not an
- * ELF section.
- *
- * Copyright 2000 Paul Mackerras.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- * Usage: addnote zImage
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-
-char arch[] = "PowerPC";
-
-#define N_DESCR 6
-unsigned int descr[N_DESCR] = {
-#if 1
-        /* values for IBM RS/6000 machines */
-        0xffffffff,             /* real-mode = true */
-        0x00c00000,             /* real-base, i.e. where we expect OF to be */
-        0xffffffff,             /* real-size */
-        0xffffffff,             /* virt-base */
-        0xffffffff,             /* virt-size */
-        0x4000,                 /* load-base */
-#else
-        /* values for longtrail CHRP */
-        0,                      /* real-mode = false */
-        0xffffffff,             /* real-base */
-        0xffffffff,             /* real-size */
-        0xffffffff,             /* virt-base */
-        0xffffffff,             /* virt-size */
-        0x00600000,             /* load-base */
-#endif
-};
-
-unsigned char buf[512];
-
-#define GET_16BE(off)   ((buf[off] << 8) + (buf[(off)+1]))
-#define GET_32BE(off)   ((GET_16BE(off) << 16) + GET_16BE((off)+2))
-
-#define PUT_16BE(off, v)        (buf[off] = ((v) >> 8) & 0xff, \
-                                 buf[(off) + 1] = (v) & 0xff)
-#define PUT_32BE(off, v)        (PUT_16BE((off), (v) >> 16), \
-                                 PUT_16BE((off) + 2, (v)))
-
-/* Structure of an ELF file */
-#define E_IDENT         0       /* ELF header */
-#define E_PHOFF         28
-#define E_PHENTSIZE     42
-#define E_PHNUM         44
-#define E_HSIZE         52      /* size of ELF header */
-
-#define EI_MAGIC        0       /* offsets in E_IDENT area */
-#define EI_CLASS        4
-#define EI_DATA         5
-
-#define PH_TYPE         0       /* ELF program header */
-#define PH_OFFSET       4
-#define PH_FILESZ       16
-#define PH_HSIZE        32      /* size of program header */
-
-#define PT_NOTE         4       /* Program header type = note */
-
-#define ELFCLASS32      1
-#define ELFDATA2MSB     2
-
-unsigned char elf_magic[4] = { 0x7f, 'E', 'L', 'F' };
-
-int main(int ac, char **av)
-{
-        int fd, n, i;
-        int ph, ps, np;
-        int nnote, ns;
-
-        if (ac != 2) {
-                fprintf(stderr, "Usage: %s elf-file\n", av[0]);
-                exit(1);
-        }
-        fd = open(av[1], O_RDWR);
-        if (fd < 0) {
-                perror(av[1]);
-                exit(1);
-        }
-
-        nnote = strlen(arch) + 1 + (N_DESCR + 3) * 4;
-
-        n = read(fd, buf, sizeof(buf));
-        if (n < 0) {
-                perror("read");
-                exit(1);
-        }
-
-        if (n < E_HSIZE || memcmp(&buf[E_IDENT+EI_MAGIC], elf_magic, 4) != 0)
-                goto notelf;
-
-        if (buf[E_IDENT+EI_CLASS] != ELFCLASS32
-            || buf[E_IDENT+EI_DATA] != ELFDATA2MSB) {
-                fprintf(stderr, "%s is not a big-endian 32-bit ELF image\n",
-                        av[1]);
-                exit(1);
-        }
-
-        ph = GET_32BE(E_PHOFF);
-        ps = GET_16BE(E_PHENTSIZE);
-        np = GET_16BE(E_PHNUM);
-        if (ph < E_HSIZE || ps < PH_HSIZE || np < 1)
-                goto notelf;
-        if (ph + (np + 1) * ps + nnote > n)
-                goto nospace;
-
-        for (i = 0; i < np; ++i) {
-                if (GET_32BE(ph + PH_TYPE) == PT_NOTE) {
-                        fprintf(stderr, "%s already has a note entry\n",
-                                av[1]);
-                        exit(0);
-                }
-                ph += ps;
-        }
-
-        /* XXX check that the area we want to use is all zeroes */
-        for (i = 0; i < ps + nnote; ++i)
-                if (buf[ph + i] != 0)
-                        goto nospace;
-
-        /* fill in the program header entry */
-        ns = ph + ps;
-        PUT_32BE(ph + PH_TYPE, PT_NOTE);
-        PUT_32BE(ph + PH_OFFSET, ns);
-        PUT_32BE(ph + PH_FILESZ, nnote);
-
-        /* fill in the note area we point to */
-        /* XXX we should probably make this a proper section */
-        PUT_32BE(ns, strlen(arch) + 1);
-        PUT_32BE(ns + 4, N_DESCR * 4);
-        PUT_32BE(ns + 8, 0x1275);
-        strcpy(&buf[ns + 12], arch);
-        ns += 12 + strlen(arch) + 1;
-        for (i = 0; i < N_DESCR; ++i)
-                PUT_32BE(ns + i * 4, descr[i]);
-
-        /* Update the number of program headers */
-        PUT_16BE(E_PHNUM, np + 1);
-
-        /* write back */
-        lseek(fd, (long) 0, SEEK_SET);
-        i = write(fd, buf, n);
-        if (i < 0) {
-                perror("write");
-                exit(1);
-        }
-        if (i < n) {
-                fprintf(stderr, "%s: write truncated\n", av[1]);
-                exit(1);
-        }
-
-        exit(0);
-
- notelf:
-        fprintf(stderr, "%s does not appear to be an ELF file\n", av[0]);
-        exit(1);
-
- nospace:
-        fprintf(stderr, "sorry, I can't find space in %s to put the note\n",
-                av[0]);
-        exit(1);
-}
diff --git a/arch/ppc/boot/utils/hack-coff.c b/arch/ppc/boot/utils/hack-coff.c
deleted file mode 100644
index 5e5a6573a1ef..000000000000
--- a/arch/ppc/boot/utils/hack-coff.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * hack-coff.c - hack the header of an xcoff file to fill in
- * a few fields needed by the Open Firmware xcoff loader on
- * Power Macs but not initialized by objcopy.
- *
- * Copyright (C) Paul Mackerras 1997.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include "rs6000.h"
-
-#define AOUT_MAGIC      0x010b
-
-#define get_16be(x)     ((((unsigned char *)(x))[0] << 8) \
-                         + ((unsigned char *)(x))[1])
-#define put_16be(x, v)  (((unsigned char *)(x))[0] = (v) >> 8, \
-                         ((unsigned char *)(x))[1] = (v) & 0xff)
-#define get_32be(x)     ((((unsigned char *)(x))[0] << 24) \
-                         + (((unsigned char *)(x))[1] << 16) \
-                         + (((unsigned char *)(x))[2] << 8) \
-                         + ((unsigned char *)(x))[3])
-
-int
-main(int ac, char **av)
-{
-    int fd;
-    int i, nsect;
-    int aoutsz;
-    struct external_filehdr fhdr;
-    AOUTHDR aout;
-    struct external_scnhdr shdr;
-
-    if (ac != 2) {
-        fprintf(stderr, "Usage: hack-coff coff-file\n");
-        exit(1);
-    }
-    if ((fd = open(av[1], 2)) == -1) {
-        perror(av[2]);
-        exit(1);
-    }
-    if (read(fd, &fhdr, sizeof(fhdr)) != sizeof(fhdr))
-        goto readerr;
-    i = get_16be(fhdr.f_magic);
-    if (i != U802TOCMAGIC && i != U802WRMAGIC && i != U802ROMAGIC) {
-        fprintf(stderr, "%s: not an xcoff file\n", av[1]);
-        exit(1);
-    }
-    aoutsz = get_16be(fhdr.f_opthdr);
-    if (read(fd, &aout, aoutsz) != aoutsz)
-        goto readerr;
-    nsect = get_16be(fhdr.f_nscns);
-    for (i = 0; i < nsect; ++i) {
-        if (read(fd, &shdr, sizeof(shdr)) != sizeof(shdr))
-            goto readerr;
-        if (strcmp(shdr.s_name, ".text") == 0) {
-            put_16be(aout.o_snentry, i+1);
-            put_16be(aout.o_sntext, i+1);
-        } else if (strcmp(shdr.s_name, ".data") == 0) {
-            put_16be(aout.o_sndata, i+1);
-        } else if (strcmp(shdr.s_name, ".bss") == 0) {
-            put_16be(aout.o_snbss, i+1);
-        }
-    }
-    put_16be(aout.magic, AOUT_MAGIC);
-    if (lseek(fd, (long) sizeof(struct external_filehdr), 0) == -1
-        || write(fd, &aout, aoutsz) != aoutsz) {
-        fprintf(stderr, "%s: write error\n", av[1]);
-        exit(1);
-    }
-    close(fd);
-    exit(0);
-
-readerr:
-    fprintf(stderr, "%s: read error or file too short\n", av[1]);
-    exit(1);
-}
diff --git a/arch/ppc/boot/utils/mkbugboot.c b/arch/ppc/boot/utils/mkbugboot.c
index 886122283f39..29115e01f60a 100644
--- a/arch/ppc/boot/utils/mkbugboot.c
+++ b/arch/ppc/boot/utils/mkbugboot.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/utils/mkbugboot.c
- *
  * Makes a Motorola PPCBUG ROM bootable image which can be flashed
  * into one of the FLASH banks on a Motorola PowerPlus board.
  *
diff --git a/arch/ppc/boot/utils/mknote.c b/arch/ppc/boot/utils/mknote.c
deleted file mode 100644
index b9fbb2cbfc8f..000000000000
--- a/arch/ppc/boot/utils/mknote.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) Cort Dougan 1999.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- * Generate a note section as per the CHRP specification.
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#define PL(x) printf("%c%c%c%c", ((x)>>24)&0xff, ((x)>>16)&0xff, ((x)>>8)&0xff, (x)&0xff );
-
-int main(void)
-{
-/* header */
-        /* namesz */
-        PL(strlen("PowerPC")+1);
-        /* descrsz */
-        PL(6*4);
-        /* type */
-        PL(0x1275);
-        /* name */
-        printf("PowerPC"); printf("%c", 0);
-        
-/* descriptor */
-        /* real-mode */
-        PL(0xffffffff);
-        /* real-base */
-        PL(0x00c00000);
-        /* real-size */
-        PL(0xffffffff);
-        /* virt-base */
-        PL(0xffffffff);
-        /* virt-size */
-        PL(0xffffffff);
-        /* load-base */
-        PL(0x4000);
-        return 0;
-}
diff --git a/arch/ppc/configs/ibmchrp_defconfig b/arch/ppc/configs/ibmchrp_defconfig
deleted file mode 100644
index 27f3e69c1f96..000000000000
--- a/arch/ppc/configs/ibmchrp_defconfig
+++ /dev/null
@@ -1,875 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_MMU=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_PPC=y
-CONFIG_PPC32=y
-CONFIG_GENERIC_NVRAM=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-# CONFIG_STANDALONE is not set
-CONFIG_BROKEN_ON_SMP=y
-
-#
-# General setup
-#
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_HOTPLUG is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
-
-#
-# Processor
-#
-CONFIG_6xx=y
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_POWER3 is not set
-# CONFIG_POWER4 is not set
-# CONFIG_8xx is not set
-# CONFIG_ALTIVEC is not set
-# CONFIG_TAU is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_PPC601_SYNC_FIX is not set
-CONFIG_PPC_STD_MMU=y
-
-#
-# Platform options
-#
-CONFIG_PPC_MULTIPLATFORM=y
-# CONFIG_APUS is not set
-# CONFIG_WILLOW is not set
-# CONFIG_PCORE is not set
-# CONFIG_POWERPMC250 is not set
-# CONFIG_EV64260 is not set
-# CONFIG_SPRUCE is not set
-# CONFIG_LOPEC is not set
-# CONFIG_MCPN765 is not set
-# CONFIG_MVME5100 is not set
-# CONFIG_PPLUS is not set
-# CONFIG_PRPMC750 is not set
-# CONFIG_PRPMC800 is not set
-# CONFIG_SANDPOINT is not set
-# CONFIG_ADIR is not set
-# CONFIG_K2 is not set
-# CONFIG_PAL4 is not set
-# CONFIG_GEMINI is not set
-# CONFIG_EST8260 is not set
-# CONFIG_SBS8260 is not set
-# CONFIG_RPX6 is not set
-# CONFIG_TQM8260 is not set
-CONFIG_PPC_CHRP=y
-CONFIG_PPC_PMAC=y
-CONFIG_PPC_PREP=y
-CONFIG_PPC_OF=y
-CONFIG_PPCBUG_NVRAM=y
-# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
-CONFIG_HIGHMEM=y
-CONFIG_KERNEL_ELF=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=y
-CONFIG_PROC_DEVICETREE=y
-CONFIG_PPC_RTAS=y
-# CONFIG_PREP_RESIDUAL is not set
-# CONFIG_CMDLINE_BOOL is not set
-
-#
-# Bus options
-#
-CONFIG_ISA=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
-
-#
-# Advanced setup
-#
-# CONFIG_ADVANCED_OPTIONS is not set
-
-#
-# Default settings for advanced configuration options are used
-#
-CONFIG_HIGHMEM_START=0xfe000000
-CONFIG_LOWMEM_SIZE=0x30000000
-CONFIG_KERNEL_START=0xc0000000
-CONFIG_TASK_SIZE=0x80000000
-CONFIG_BOOT_LOAD=0x00800000
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNP is not set
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=y
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_CARMEL is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_LBD=y
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_REPORT_LUNS is not set
-CONFIG_SCSI_CONSTANTS=y
-# CONFIG_SCSI_LOGGING is not set
-
-#
-# SCSI Transport Attributes
-#
-CONFIG_SCSI_SPI_ATTRS=y
-# CONFIG_SCSI_FC_ATTRS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_MEGARAID is not set
-# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA2XXX=y
-# CONFIG_SCSI_QLA21XX is not set
-# CONFIG_SCSI_QLA22XX is not set
-# CONFIG_SCSI_QLA2300 is not set
-# CONFIG_SCSI_QLA2322 is not set
-# CONFIG_SCSI_QLA6312 is not set
-# CONFIG_SCSI_QLA6322 is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_MESH is not set
-# CONFIG_SCSI_MAC53C94 is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-
-#
-# Macintosh device drivers
-#
-# CONFIG_ADB is not set
-# CONFIG_ADB_CUDA is not set
-# CONFIG_ADB_PMU is not set
-# CONFIG_MAC_FLOPPY is not set
-# CONFIG_MAC_SERIAL is not set
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK_DEV is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-
-#
-# IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-# CONFIG_IPV6 is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-# CONFIG_IP_NF_QUEUE is not set
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MAC=m
-# CONFIG_IP_NF_MATCH_PKTTYPE is not set
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_COMPAT_IPCHAINS=m
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_RAW=m
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-# CONFIG_MACE is not set
-# CONFIG_BMAC is not set
-# CONFIG_OAKNET is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_AC3200 is not set
-# CONFIG_APRICOT is not set
-# CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_DGRS is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_E100 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_NET_POCKET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_NET_FC is not set
-# CONFIG_RCPCI is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PCIPS2 is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_CONSOLE is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_PMACZILOG is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-CONFIG_NVRAM=y
-CONFIG_GEN_RTC=y
-# CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# Misc devices
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_OF=y
-# CONFIG_FB_CONTROL is not set
-# CONFIG_FB_PLATINUM is not set
-# CONFIG_FB_VALKYRIE is not set
-# CONFIG_FB_CT65550 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_S3TRIO is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_RIVA is not set
-CONFIG_FB_MATROX=y
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-# CONFIG_FB_MATROX_G450 is not set
-CONFIG_FB_MATROX_G100A=y
-CONFIG_FB_MATROX_G100=y
-# CONFIG_FB_MATROX_MULTIHEAD is not set
-# CONFIG_FB_RADEON_OLD is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-CONFIG_FB_3DFX=y
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_PCI_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-CONFIG_DEVFS_FS=y
-# CONFIG_DEVFS_MOUNT is not set
-# CONFIG_DEVFS_DEBUG is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
-CONFIG_TMPFS=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
-# CONFIG_EXPORTFS is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_NEC98_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-CONFIG_NLS_ISO8859_1=m
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_BOOTX_TEXT is not set
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
diff --git a/arch/ppc/configs/ml300_defconfig b/arch/ppc/configs/ml300_defconfig
new file mode 100644
index 000000000000..4a33aca948cc
--- /dev/null
+++ b/arch/ppc/configs/ml300_defconfig
@@ -0,0 +1,739 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.16-rc1
+# Wed Jan 18 00:49:20 2006
+#
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_PPC=y
+CONFIG_PPC32=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_LBD=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# Processor
+#
+# CONFIG_6xx is not set
+CONFIG_40x=y
+# CONFIG_44x is not set
+# CONFIG_POWER3 is not set
+# CONFIG_8xx is not set
+# CONFIG_E200 is not set
+# CONFIG_E500 is not set
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_KEXEC is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_4xx=y
+# CONFIG_WANT_EARLY_SERIAL is not set
+
+#
+# IBM 4xx options
+#
+# CONFIG_BUBINGA is not set
+# CONFIG_CPCI405 is not set
+# CONFIG_EP405 is not set
+# CONFIG_REDWOOD_5 is not set
+# CONFIG_REDWOOD_6 is not set
+# CONFIG_SYCAMORE is not set
+# CONFIG_WALNUT is not set
+CONFIG_XILINX_ML300=y
+CONFIG_IBM405_ERR77=y
+CONFIG_IBM405_ERR51=y
+CONFIG_XILINX_VIRTEX=y
+CONFIG_EMBEDDEDBOOT=y
+# CONFIG_PPC4xx_DMA is not set
+CONFIG_PPC_GEN550=y
+CONFIG_UART0_TTYS0=y
+# CONFIG_UART0_TTYS1 is not set
+CONFIG_NOT_COHERENT_CACHE=y
+
+#
+# Platform options
+#
+# CONFIG_PC_KEYBOARD is not set
+# CONFIG_HIGHMEM is not set
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS0,9600"
+# CONFIG_PM is not set
+# CONFIG_SOFTWARE_SUSPEND is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PCI is not set
+# CONFIG_PCI_DOMAINS is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0x80000000
+CONFIG_CONSISTENT_START=0xff100000
+CONFIG_CONSISTENT_SIZE=0x00200000
+CONFIG_BOOT_LOAD=0x00400000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Macintosh device drivers
+#
+# CONFIG_WINDFARM is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=y
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+# CONFIG_IBM_EMAC is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+
+#
+# SN Devices
+#
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# IBM 40x options
+#
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_KGDB is not set
+CONFIG_XMON=y
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_SERIAL_TEXT_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Hardware crypto devices
+#
diff --git a/arch/ppc/configs/ml403_defconfig b/arch/ppc/configs/ml403_defconfig
new file mode 100644
index 000000000000..fafd2516fa51
--- /dev/null
+++ b/arch/ppc/configs/ml403_defconfig
@@ -0,0 +1,740 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.16-rc1
+# Wed Jan 18 01:11:41 2006
+#
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_PPC=y
+CONFIG_PPC32=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_LBD=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# Processor
+#
+# CONFIG_6xx is not set
+CONFIG_40x=y
+# CONFIG_44x is not set
+# CONFIG_POWER3 is not set
+# CONFIG_8xx is not set
+# CONFIG_E200 is not set
+# CONFIG_E500 is not set
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_KEXEC is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_4xx=y
+# CONFIG_WANT_EARLY_SERIAL is not set
+
+#
+# IBM 4xx options
+#
+# CONFIG_BUBINGA is not set
+# CONFIG_CPCI405 is not set
+# CONFIG_EP405 is not set
+# CONFIG_REDWOOD_5 is not set
+# CONFIG_REDWOOD_6 is not set
+# CONFIG_SYCAMORE is not set
+# CONFIG_WALNUT is not set
+# CONFIG_XILINX_ML300 is not set
+CONFIG_XILINX_ML403=y
+CONFIG_IBM405_ERR77=y
+CONFIG_IBM405_ERR51=y
+CONFIG_XILINX_VIRTEX=y
+CONFIG_EMBEDDEDBOOT=y
+# CONFIG_PPC4xx_DMA is not set
+CONFIG_PPC_GEN550=y
+CONFIG_UART0_TTYS0=y
+# CONFIG_UART0_TTYS1 is not set
+CONFIG_NOT_COHERENT_CACHE=y
+
+#
+# Platform options
+#
+# CONFIG_PC_KEYBOARD is not set
+# CONFIG_HIGHMEM is not set
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS0,9600"
+# CONFIG_PM is not set
+# CONFIG_SOFTWARE_SUSPEND is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PCI is not set
+# CONFIG_PCI_DOMAINS is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0x80000000
+CONFIG_CONSISTENT_START=0xff100000
+CONFIG_CONSISTENT_SIZE=0x00200000
+CONFIG_BOOT_LOAD=0x00400000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Macintosh device drivers
+#
+# CONFIG_WINDFARM is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=y
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+# CONFIG_IBM_EMAC is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+
+#
+# SN Devices
+#
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# IBM 40x options
+#
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_KGDB is not set
+CONFIG_XMON=y
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_SERIAL_TEXT_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Hardware crypto devices
+#
diff --git a/arch/ppc/configs/pmac_defconfig b/arch/ppc/configs/pmac_defconfig
deleted file mode 100644
index a2db8b541c9b..000000000000
--- a/arch/ppc/configs/pmac_defconfig
+++ /dev/null
@@ -1,1591 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc3
-# Wed Jul 13 14:13:13 2005
-#
-CONFIG_MMU=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_PPC=y
-CONFIG_PPC32=y
-CONFIG_GENERIC_NVRAM=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_KMOD=y
-
-#
-# Processor
-#
-CONFIG_6xx=y
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_POWER3 is not set
-# CONFIG_POWER4 is not set
-# CONFIG_8xx is not set
-# CONFIG_E200 is not set
-# CONFIG_E500 is not set
-CONFIG_PPC_FPU=y
-CONFIG_ALTIVEC=y
-CONFIG_TAU=y
-# CONFIG_TAU_INT is not set
-# CONFIG_TAU_AVERAGE is not set
-# CONFIG_KEXEC is not set
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_PMAC=y
-CONFIG_PPC601_SYNC_FIX=y
-CONFIG_PM=y
-CONFIG_PPC_STD_MMU=y
-
-#
-# Platform options
-#
-CONFIG_PPC_MULTIPLATFORM=y
-# CONFIG_APUS is not set
-# CONFIG_KATANA is not set
-# CONFIG_WILLOW is not set
-# CONFIG_CPCI690 is not set
-# CONFIG_PCORE is not set
-# CONFIG_POWERPMC250 is not set
-# CONFIG_CHESTNUT is not set
-# CONFIG_SPRUCE is not set
-# CONFIG_HDPU is not set
-# CONFIG_EV64260 is not set
-# CONFIG_LOPEC is not set
-# CONFIG_MCPN765 is not set
-# CONFIG_MVME5100 is not set
-# CONFIG_PPLUS is not set
-# CONFIG_PRPMC750 is not set
-# CONFIG_PRPMC800 is not set
-# CONFIG_SANDPOINT is not set
-# CONFIG_RADSTONE_PPC7D is not set
-# CONFIG_ADIR is not set
-# CONFIG_K2 is not set
-# CONFIG_PAL4 is not set
-# CONFIG_GEMINI is not set
-# CONFIG_EST8260 is not set
-# CONFIG_SBC82xx is not set
-# CONFIG_SBS8260 is not set
-# CONFIG_RPX8260 is not set
-# CONFIG_TQM8260 is not set
-# CONFIG_ADS8272 is not set
-# CONFIG_PQ2FADS is not set
-# CONFIG_LITE5200 is not set
-# CONFIG_MPC834x_SYS is not set
-CONFIG_PPC_CHRP=y
-CONFIG_PPC_PMAC=y
-CONFIG_PPC_PREP=y
-CONFIG_PPC_OF=y
-CONFIG_PPCBUG_NVRAM=y
-# CONFIG_SMP is not set
-# CONFIG_HIGHMEM is not set
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PROC_DEVICETREE=y
-# CONFIG_PREP_RESIDUAL is not set
-# CONFIG_CMDLINE_BOOL is not set
-# CONFIG_PM_DEBUG is not set
-CONFIG_SOFTWARE_SUSPEND=y
-CONFIG_PM_STD_PARTITION=""
-# CONFIG_SECCOMP is not set
-CONFIG_ISA_DMA_API=y
-
-#
-# Bus options
-#
-# CONFIG_ISA is not set
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
-# CONFIG_PCI_DEBUG is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_IOCTL is not set
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-# CONFIG_PD6729 is not set
-# CONFIG_I82092 is not set
-# CONFIG_TCIC is not set
-CONFIG_PCCARD_NONSTATIC=m
-
-#
-# Advanced setup
-#
-CONFIG_ADVANCED_OPTIONS=y
-CONFIG_HIGHMEM_START=0xfe000000
-# CONFIG_LOWMEM_SIZE_BOOL is not set
-CONFIG_LOWMEM_SIZE=0x30000000
-# CONFIG_KERNEL_START_BOOL is not set
-CONFIG_KERNEL_START=0xc0000000
-CONFIG_TASK_SIZE_BOOL=y
-CONFIG_TASK_SIZE=0xc0000000
-CONFIG_BOOT_LOAD=0x00800000
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-
-#
-# IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-# CONFIG_IPV6 is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_CT_ACCT=y
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_PKTTYPE=m
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_REALM=m
-CONFIG_IP_NF_MATCH_SCTP=m
-CONFIG_IP_NF_MATCH_COMMENT=m
-CONFIG_IP_NF_MATCH_CONNMARK=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_CLASSIFY=m
-CONFIG_IP_NF_TARGET_CONNMARK=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_SCHED is not set
-CONFIG_NET_CLS_ROUTE=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-# CONFIG_DONGLE is not set
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-# CONFIG_USB_IRDA is not set
-# CONFIG_SIGMATEL_FIR is not set
-# CONFIG_NSC_FIR is not set
-# CONFIG_WINBOND_FIR is not set
-# CONFIG_TOSHIBA_FIR is not set
-# CONFIG_SMC_IRCC_FIR is not set
-# CONFIG_ALI_FIR is not set
-# CONFIG_VLSI_FIR is not set
-# CONFIG_VIA_FIR is not set
-# CONFIG_BT is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-# CONFIG_STANDALONE is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
-# CONFIG_DEBUG_DRIVER is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-CONFIG_MAC_FLOPPY=m
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_LBD=y
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECS is not set
-CONFIG_BLK_DEV_IDECD=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=y
-CONFIG_BLK_DEV_IDESCSI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_IDE_GENERIC is not set
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-CONFIG_BLK_DEV_CMD64X=y
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-# CONFIG_PDC202XX_FORCE is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-CONFIG_BLK_DEV_IDE_PMAC=y
-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
-CONFIG_BLK_DEV_IDEDMA_PMAC=y
-CONFIG_BLK_DEV_IDE_PMAC_BLINK=y
-# CONFIG_IDE_ARM is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-# CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_CONSTANTS=y
-# CONFIG_SCSI_LOGGING is not set
-
-#
-# SCSI Transport Attributes
-#
-CONFIG_SCSI_SPI_ATTRS=y
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-CONFIG_AIC7XXX_DEBUG_ENABLE=y
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC7XXX_OLD=m
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA2XXX=y
-# CONFIG_SCSI_QLA21XX is not set
-# CONFIG_SCSI_QLA22XX is not set
-# CONFIG_SCSI_QLA2300 is not set
-# CONFIG_SCSI_QLA2322 is not set
-# CONFIG_SCSI_QLA6312 is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_MESH=y
-CONFIG_SCSI_MESH_SYNC_RATE=5
-CONFIG_SCSI_MESH_RESET_DELAY_MS=1000
-CONFIG_SCSI_MAC53C94=y
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SPI is not set
-# CONFIG_FUSION_FC is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_IEEE1394=m
-
-#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_OUI_DB is not set
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
-# CONFIG_IEEE1394_EXPORT_FULL_API is not set
-
-#
-# Device Drivers
-#
-# CONFIG_IEEE1394_PCILYNX is not set
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-
-#
-# Macintosh device drivers
-#
-CONFIG_ADB=y
-CONFIG_ADB_CUDA=y
-CONFIG_ADB_PMU=y
-CONFIG_PMAC_APM_EMU=y
-CONFIG_PMAC_MEDIABAY=y
-CONFIG_PMAC_BACKLIGHT=y
-CONFIG_ADB_MACIO=y
-CONFIG_INPUT_ADBHID=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_THERM_WINDTUNNEL=m
-CONFIG_THERM_ADT746X=m
-# CONFIG_ANSLCD is not set
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_MACE=y
-# CONFIG_MACE_AAUI_PORT is not set
-CONFIG_BMAC=y
-# CONFIG_HAPPYMEAL is not set
-CONFIG_SUNGEM=y
-# CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
-# CONFIG_DGRS is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_E100 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-# CONFIG_MV643XX_ETH is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-CONFIG_HERMES=m
-CONFIG_APPLE_AIRPORT=m
-# CONFIG_PLX_HERMES is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-# CONFIG_PRISM54 is not set
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
-# CONFIG_NET_PCMCIA is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PPP=y
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=y
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=y
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPPOE=m
-# CONFIG_SLIP is not set
-# CONFIG_NET_FC is not set
-# CONFIG_SHAPER is not set
-CONFIG_NETCONSOLE=m
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_PMACZILOG=y
-CONFIG_SERIAL_PMACZILOG_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-CONFIG_NVRAM=y
-CONFIG_GEN_RTC=y
-# CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-CONFIG_AGP=m
-CONFIG_AGP_UNINORTH=m
-CONFIG_DRM=m
-# CONFIG_DRM_TDFX is not set
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_SIS is not set
-# CONFIG_DRM_VIA is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=y
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALGOPCA is not set
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_HYDRA is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_ISA is not set
-CONFIG_I2C_KEYWEST=m
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_SCx200_ACB is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_SENSOR is not set
-
-#
-# Miscellaneous I2C Chip support
-#
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_RTC8564 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
-# CONFIG_HWMON is not set
-
-#
-# Misc devices
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
-CONFIG_FB_MACMODES=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_OF=y
-CONFIG_FB_CONTROL=y
-CONFIG_FB_PLATINUM=y
-CONFIG_FB_VALKYRIE=y
-CONFIG_FB_CT65550=y
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_IMSTT=y
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-CONFIG_FB_MATROX=y
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-# CONFIG_FB_MATROX_I2C is not set
-# CONFIG_FB_MATROX_MULTIHEAD is not set
-# CONFIG_FB_RADEON_OLD is not set
-CONFIG_FB_RADEON=y
-CONFIG_FB_RADEON_I2C=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=y
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-# CONFIG_FB_ATY_XL_INIT is not set
-CONFIG_FB_ATY_GX=y
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-CONFIG_FB_3DFX=y
-CONFIG_FB_3DFX_ACCEL=y
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_DEVICE=y
-
-#
-# Sound
-#
-CONFIG_SOUND=m
-CONFIG_DMASOUND_PMAC=m
-CONFIG_DMASOUND=m
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_DUMMY=m
-# CONFIG_SND_VIRMIDI is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-
-#
-# PCI devices
-#
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_HDA_INTEL is not set
-
-#
-# ALSA PowerMac devices
-#
-CONFIG_SND_POWERMAC=m
-
-#
-# USB devices
-#
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_USX2Y=m
-
-#
-# PCMCIA devices
-#
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_EHCI_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_SL811_HCD is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_AUDIO is not set
-# CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
-#
-# CONFIG_USB_STORAGE is not set
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-# CONFIG_HID_FF is not set
-CONFIG_USB_HIDDEV=y
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_MTOUCH is not set
-# CONFIG_USB_ITMTOUCH is not set
-# CONFIG_USB_EGALAX is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-
-#
-# USB Multimedia devices
-#
-# CONFIG_USB_DABUSB is not set
-
-#
-# Video4Linux support is needed for USB Multimedia device support
-#
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-CONFIG_USB_PEGASUS=m
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_MON is not set
-
-#
-# USB port drivers
-#
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-# CONFIG_USB_SERIAL_GENERIC is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-CONFIG_USB_SERIAL_VISOR=m
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-CONFIG_USB_EZUSB=y
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TEST is not set
-
-#
-# USB DSL modem support
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
-# InfiniBand support
-#
-# CONFIG_INFINIBAND is not set
-
-#
-# SN Devices
-#
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-# CONFIG_EXT2_FS_POSIX_ACL is not set
-# CONFIG_EXT2_FS_SECURITY is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-
-#
-# XFS support
-#
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-CONFIG_DEVPTS_FS_XATTR=y
-CONFIG_DEVPTS_FS_SECURITY=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_TMPFS_SECURITY=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_CRAMFS=m
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-# CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=y
-CONFIG_NFS_ACL_SUPPORT=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-CONFIG_NLS_ISO8859_15=m
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=m
-
-#
-# Library routines
-#
-CONFIG_CRC_CCITT=y
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_DEBUG_KERNEL=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_LOG_BUF_SHIFT=16
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_XMON is not set
-# CONFIG_BDI_SWITCH is not set
-CONFIG_BOOTX_TEXT=y
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Hardware crypto devices
-#
diff --git a/arch/ppc/configs/power3_defconfig b/arch/ppc/configs/power3_defconfig
deleted file mode 100644
index a1ef929bca59..000000000000
--- a/arch/ppc/configs/power3_defconfig
+++ /dev/null
@@ -1,1035 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_MMU=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_PPC=y
-CONFIG_PPC32=y
-CONFIG_GENERIC_NVRAM=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-# CONFIG_STANDALONE is not set
-
-#
-# General setup
-#
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_HOTPLUG is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
-CONFIG_STOP_MACHINE=y
-
-#
-# Processor
-#
-# CONFIG_6xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-CONFIG_POWER3=y
-# CONFIG_POWER4 is not set
-# CONFIG_8xx is not set
-# CONFIG_CPU_FREQ is not set
-CONFIG_PPC64BRIDGE=y
-CONFIG_PPC_STD_MMU=y
-
-#
-# Platform options
-#
-CONFIG_PPC_MULTIPLATFORM=y
-# CONFIG_APUS is not set
-# CONFIG_WILLOW is not set
-# CONFIG_PCORE is not set
-# CONFIG_POWERPMC250 is not set
-# CONFIG_EV64260 is not set
-# CONFIG_SPRUCE is not set
-# CONFIG_LOPEC is not set
-# CONFIG_MCPN765 is not set
-# CONFIG_MVME5100 is not set
-# CONFIG_PPLUS is not set
-# CONFIG_PRPMC750 is not set
-# CONFIG_PRPMC800 is not set
-# CONFIG_SANDPOINT is not set
-# CONFIG_ADIR is not set
-# CONFIG_K2 is not set
-# CONFIG_PAL4 is not set
-# CONFIG_GEMINI is not set
-# CONFIG_EST8260 is not set
-# CONFIG_SBS8260 is not set
-# CONFIG_RPX6 is not set
-# CONFIG_TQM8260 is not set
-CONFIG_PPC_CHRP=y
-CONFIG_PPC_PMAC=y
-CONFIG_PPC_PREP=y
-CONFIG_PPC_OF=y
-CONFIG_PPCBUG_NVRAM=y
-CONFIG_SMP=y
-# CONFIG_IRQ_ALL_CPUS is not set
-CONFIG_NR_CPUS=32
-# CONFIG_PREEMPT is not set
-CONFIG_HIGHMEM=y
-CONFIG_KERNEL_ELF=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=y
-CONFIG_PROC_DEVICETREE=y
-CONFIG_PPC_RTAS=y
-# CONFIG_PREP_RESIDUAL is not set
-# CONFIG_CMDLINE_BOOL is not set
-
-#
-# Bus options
-#
-CONFIG_ISA=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
-
-#
-# Advanced setup
-#
-CONFIG_ADVANCED_OPTIONS=y
-# CONFIG_HIGHMEM_START_BOOL is not set
-CONFIG_HIGHMEM_START=0xfe000000
-# CONFIG_LOWMEM_SIZE_BOOL is not set
-CONFIG_LOWMEM_SIZE=0x30000000
-# CONFIG_KERNEL_START_BOOL is not set
-CONFIG_KERNEL_START=0xc0000000
-CONFIG_TASK_SIZE_BOOL=y
-CONFIG_TASK_SIZE=0xc0000000
-CONFIG_BOOT_LOAD=0x00800000
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_CML1=m
-# CONFIG_PARPORT_SERIAL is not set
-CONFIG_PARPORT_PC_FIFO=y
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_OTHER is not set
-# CONFIG_PARPORT_1284 is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNP is not set
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=y
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_CARMEL is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_LBD=y
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_REPORT_LUNS is not set
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-
-#
-# SCSI Transport Attributes
-#
-CONFIG_SCSI_SPI_ATTRS=y
-# CONFIG_SCSI_FC_ATTRS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_MEGARAID is not set
-# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA2XXX=y
-# CONFIG_SCSI_QLA21XX is not set
-# CONFIG_SCSI_QLA22XX is not set
-# CONFIG_SCSI_QLA2300 is not set
-# CONFIG_SCSI_QLA2322 is not set
-# CONFIG_SCSI_QLA6312 is not set
-# CONFIG_SCSI_QLA6322 is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_MESH is not set
-# CONFIG_SCSI_MAC53C94 is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_LINEAR=y
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-CONFIG_MD_RAID5=y
-CONFIG_MD_RAID6=y
-# CONFIG_MD_MULTIPATH is not set
-CONFIG_BLK_DEV_DM=y
-CONFIG_DM_CRYPT=y
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-
-#
-# Macintosh device drivers
-#
-# CONFIG_ADB is not set
-# CONFIG_ADB_CUDA is not set
-# CONFIG_ADB_PMU is not set
-# CONFIG_MAC_FLOPPY is not set
-# CONFIG_MAC_SERIAL is not set
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK_DEV is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-# CONFIG_MACE is not set
-# CONFIG_BMAC is not set
-# CONFIG_OAKNET is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_AC3200 is not set
-# CONFIG_APRICOT is not set
-# CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_DGRS is not set
-# CONFIG_EEPRO100 is not set
-CONFIG_E100=y
-# CONFIG_E100_NAPI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_NET_POCKET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PLIP is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_NET_FC is not set
-# CONFIG_RCPCI is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input I/O drivers
-#
-CONFIG_GAMEPORT=m
-CONFIG_SOUND_GAMEPORT=m
-# CONFIG_GAMEPORT_NS558 is not set
-# CONFIG_GAMEPORT_L4 is not set
-# CONFIG_GAMEPORT_EMU10K1 is not set
-# CONFIG_GAMEPORT_VORTEX is not set
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_CS461x is not set
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PARKBD is not set
-# CONFIG_SERIO_PCIPS2 is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_PMACZILOG is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-# CONFIG_PPDEV is not set
-# CONFIG_TIPAR is not set
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-CONFIG_NVRAM=y
-CONFIG_GEN_RTC=y
-# CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_ALGOPCF=y
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_HYDRA is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_ISA is not set
-# CONFIG_I2C_KEYWEST is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_SCx200_ACB is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-
-#
-# Hardware Sensors Chip support
-#
-# CONFIG_I2C_SENSOR is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83627HF is not set
-
-#
-# Other I2C Chip support
-#
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# Misc devices
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_OF=y
-# CONFIG_FB_CONTROL is not set
-# CONFIG_FB_PLATINUM is not set
-# CONFIG_FB_VALKYRIE is not set
-# CONFIG_FB_CT65550 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_S3TRIO is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_RIVA is not set
-CONFIG_FB_MATROX=y
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-# CONFIG_FB_MATROX_G450 is not set
-CONFIG_FB_MATROX_G100A=y
-CONFIG_FB_MATROX_G100=y
-CONFIG_FB_MATROX_I2C=y
-# CONFIG_FB_MATROX_MAVEN is not set
-CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_RADEON_OLD is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_PCI_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-
-#
-# Sound
-#
-CONFIG_SOUND=y
-# CONFIG_DMASOUND_PMAC is not set
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_DUMMY=m
-# CONFIG_SND_VIRMIDI is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-
-#
-# ISA devices
-#
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_CS4231 is not set
-CONFIG_SND_CS4232=m
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SSCAPE is not set
-
-#
-# PCI devices
-#
-CONFIG_SND_AC97_CODEC=m
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-CONFIG_SND_CS46XX=m
-# CONFIG_SND_CS46XX_NEW_DSP is not set
-CONFIG_SND_CS4281=m
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VX222 is not set
-
-#
-# ALSA PowerMac devices
-#
-# CONFIG_SND_POWERMAC is not set
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
-CONFIG_TMPFS=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_LOCKD=y
-CONFIG_EXPORTFS=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
-
-#
-# Kernel hacking
-#
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_BOOTX_TEXT=y
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-# CONFIG_CRYPTO_SERPENT is not set
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_TEST is not set
diff --git a/arch/ppc/configs/common_defconfig b/arch/ppc/configs/prep_defconfig
index 4d33bee23a89..4d33bee23a89 100644
--- a/arch/ppc/configs/common_defconfig
+++ b/arch/ppc/configs/prep_defconfig
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index e399bbb969a4..466437f4bcbb 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -1,48 +1,24 @@
 #
 # Makefile for the linux kernel.
 #
-ifneq ($(CONFIG_PPC_MERGE),y)
-
 extra-$(CONFIG_PPC_STD_MMU)     := head.o
 extra-$(CONFIG_40x)             := head_4xx.o
 extra-$(CONFIG_44x)             := head_44x.o
 extra-$(CONFIG_FSL_BOOKE)       := head_fsl_booke.o
 extra-$(CONFIG_8xx)             := head_8xx.o
-extra-$(CONFIG_6xx)             += idle_6xx.o
 extra-y                         += vmlinux.lds
 
-obj-y                           := entry.o traps.o idle.o time.o misc.o \
+obj-y                           := entry.o traps.o time.o misc.o \
                                         setup.o \
                                         ppc_htab.o
-obj-$(CONFIG_6xx)               += l2cr.o cpu_setup_6xx.o
-obj-$(CONFIG_SOFTWARE_SUSPEND)  += swsusp.o
-obj-$(CONFIG_MODULES)           += module.o ppc_ksyms.o
+obj-$(CONFIG_MODULES)           += ppc_ksyms.o
 obj-$(CONFIG_NOT_COHERENT_CACHE)        += dma-mapping.o
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_RAPIDIO)           += rio.o
 obj-$(CONFIG_KGDB)              += ppc-stub.o
 obj-$(CONFIG_SMP)               += smp.o smp-tbsync.o
-obj-$(CONFIG_TAU)               += temp.o
-ifndef CONFIG_E200
-obj-$(CONFIG_FSL_BOOKE)         += perfmon_fsl_booke.o
-endif
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
 
 ifndef CONFIG_MATH_EMULATION
 obj-$(CONFIG_8xx)               += softemu8xx.o
 endif
-
-# These are here while we do the architecture merge
-
-else
-obj-y                           := idle.o
-obj-$(CONFIG_6xx)               += l2cr.o cpu_setup_6xx.o
-obj-$(CONFIG_SOFTWARE_SUSPEND)  += swsusp.o
-obj-$(CONFIG_MODULES)           += module.o
-obj-$(CONFIG_NOT_COHERENT_CACHE)        += dma-mapping.o
-obj-$(CONFIG_KGDB)              += ppc-stub.o
-obj-$(CONFIG_TAU)               += temp.o
-ifndef CONFIG_E200
-obj-$(CONFIG_FSL_BOOKE)         += perfmon_fsl_booke.o
-endif
-endif
diff --git a/arch/ppc/kernel/cpu_setup_6xx.S b/arch/ppc/kernel/cpu_setup_6xx.S
deleted file mode 100644
index 55ed7716636f..000000000000
--- a/arch/ppc/kernel/cpu_setup_6xx.S
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * This file contains low level CPU setup functions.
- *    Copyright (C) 2003 Benjamin Herrenschmidt (benh@kernel.crashing.org)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- */
-
-#include <linux/config.h>
-#include <asm/processor.h>
-#include <asm/page.h>
-#include <asm/cputable.h>
-#include <asm/ppc_asm.h>
-#include <asm/asm-offsets.h>
-#include <asm/cache.h>
-
-_GLOBAL(__setup_cpu_603)
-        b       setup_common_caches
-_GLOBAL(__setup_cpu_604)
-        mflr    r4
-        bl      setup_common_caches
-        bl      setup_604_hid0
-        mtlr    r4
-        blr
-_GLOBAL(__setup_cpu_750)
-        mflr    r4
-        bl      __init_fpu_registers
-        bl      setup_common_caches
-        bl      setup_750_7400_hid0
-        mtlr    r4
-        blr
-_GLOBAL(__setup_cpu_750cx)
-        mflr    r4
-        bl      __init_fpu_registers
-        bl      setup_common_caches
-        bl      setup_750_7400_hid0
-        bl      setup_750cx
-        mtlr    r4
-        blr
-_GLOBAL(__setup_cpu_750fx)
-        mflr    r4
-        bl      __init_fpu_registers
-        bl      setup_common_caches
-        bl      setup_750_7400_hid0
-        bl      setup_750fx
-        mtlr    r4
-        blr
-_GLOBAL(__setup_cpu_7400)
-        mflr    r4
-        bl      __init_fpu_registers
-        bl      setup_7400_workarounds
-        bl      setup_common_caches
-        bl      setup_750_7400_hid0
-        mtlr    r4
-        blr
-_GLOBAL(__setup_cpu_7410)
-        mflr    r4
-        bl      __init_fpu_registers
-        bl      setup_7410_workarounds
-        bl      setup_common_caches
-        bl      setup_750_7400_hid0
-        li      r3,0
-        mtspr   SPRN_L2CR2,r3
-        mtlr    r4
-        blr
-_GLOBAL(__setup_cpu_745x)
-        mflr    r4
-        bl      setup_common_caches
-        bl      setup_745x_specifics
-        mtlr    r4
-        blr
-
-/* Enable caches for 603's, 604, 750 & 7400 */
-setup_common_caches:
-        mfspr   r11,SPRN_HID0
-        andi.   r0,r11,HID0_DCE
-        ori     r11,r11,HID0_ICE|HID0_DCE
-        ori     r8,r11,HID0_ICFI
-        bne     1f                      /* don't invalidate the D-cache */
-        ori     r8,r8,HID0_DCI          /* unless it wasn't enabled */
-1:      sync
-        mtspr   SPRN_HID0,r8            /* enable and invalidate caches */
-        sync
-        mtspr   SPRN_HID0,r11           /* enable caches */
-        sync
-        isync
-        blr
-
-/* 604, 604e, 604ev, ...
- * Enable superscalar execution & branch history table
- */
-setup_604_hid0:
-        mfspr   r11,SPRN_HID0
-        ori     r11,r11,HID0_SIED|HID0_BHTE
-        ori     r8,r11,HID0_BTCD
-        sync
-        mtspr   SPRN_HID0,r8    /* flush branch target address cache */
-        sync                    /* on 604e/604r */
-        mtspr   SPRN_HID0,r11
-        sync
-        isync
-        blr
-
-/* 7400 <= rev 2.7 and 7410 rev = 1.0 suffer from some
- * erratas we work around here.
- * Moto MPC710CE.pdf describes them, those are errata
- * #3, #4 and #5
- * Note that we assume the firmware didn't choose to
- * apply other workarounds (there are other ones documented
- * in the .pdf). It appear that Apple firmware only works
- * around #3 and with the same fix we use. We may want to
- * check if the CPU is using 60x bus mode in which case
- * the workaround for errata #4 is useless. Also, we may
- * want to explicitely clear HID0_NOPDST as this is not
- * needed once we have applied workaround #5 (though it's
- * not set by Apple's firmware at least).
- */
-setup_7400_workarounds:
-        mfpvr   r3
-        rlwinm  r3,r3,0,20,31
-        cmpwi   0,r3,0x0207
-        ble     1f
-        blr
-setup_7410_workarounds:
-        mfpvr   r3
-        rlwinm  r3,r3,0,20,31
-        cmpwi   0,r3,0x0100
-        bnelr
-1:
-        mfspr   r11,SPRN_MSSSR0
-        /* Errata #3: Set L1OPQ_SIZE to 0x10 */
-        rlwinm  r11,r11,0,9,6
-        oris    r11,r11,0x0100
-        /* Errata #4: Set L2MQ_SIZE to 1 (check for MPX mode first ?) */
-        oris    r11,r11,0x0002
-        /* Errata #5: Set DRLT_SIZE to 0x01 */
-        rlwinm  r11,r11,0,5,2
-        oris    r11,r11,0x0800
-        sync
-        mtspr   SPRN_MSSSR0,r11
-        sync
-        isync
-        blr
-
-/* 740/750/7400/7410
- * Enable Store Gathering (SGE), Address Brodcast (ABE),
- * Branch History Table (BHTE), Branch Target ICache (BTIC)
- * Dynamic Power Management (DPM), Speculative (SPD)
- * Clear Instruction cache throttling (ICTC)
- */
-setup_750_7400_hid0:
-        mfspr   r11,SPRN_HID0
-        ori     r11,r11,HID0_SGE | HID0_ABE | HID0_BHTE | HID0_BTIC
-        oris    r11,r11,HID0_DPM@h
-BEGIN_FTR_SECTION
-        xori    r11,r11,HID0_BTIC
-END_FTR_SECTION_IFSET(CPU_FTR_NO_BTIC)
-BEGIN_FTR_SECTION
-        xoris   r11,r11,HID0_DPM@h      /* disable dynamic power mgmt */
-END_FTR_SECTION_IFSET(CPU_FTR_NO_DPM)
-        li      r3,HID0_SPD
-        andc    r11,r11,r3              /* clear SPD: enable speculative */
-        li      r3,0
-        mtspr   SPRN_ICTC,r3            /* Instruction Cache Throttling off */
-        isync
-        mtspr   SPRN_HID0,r11
-        sync
-        isync
-        blr
-
-/* 750cx specific
- * Looks like we have to disable NAP feature for some PLL settings...
- * (waiting for confirmation)
- */
-setup_750cx:
-        mfspr   r10, SPRN_HID1
-        rlwinm  r10,r10,4,28,31
-        cmpwi   cr0,r10,7
-        cmpwi   cr1,r10,9
-        cmpwi   cr2,r10,11
-        cror    4*cr0+eq,4*cr0+eq,4*cr1+eq
-        cror    4*cr0+eq,4*cr0+eq,4*cr2+eq
-        bnelr
-        lwz     r6,CPU_SPEC_FEATURES(r5)
-        li      r7,CPU_FTR_CAN_NAP
-        andc    r6,r6,r7
-        stw     r6,CPU_SPEC_FEATURES(r5)
-        blr
-
-/* 750fx specific
- */
-setup_750fx:
-        blr
-
-/* MPC 745x
- * Enable Store Gathering (SGE), Branch Folding (FOLD)
- * Branch History Table (BHTE), Branch Target ICache (BTIC)
- * Dynamic Power Management (DPM), Speculative (SPD)
- * Ensure our data cache instructions really operate.
- * Timebase has to be running or we wouldn't have made it here,
- * just ensure we don't disable it.
- * Clear Instruction cache throttling (ICTC)
- * Enable L2 HW prefetch
- */
-setup_745x_specifics:
-        /* We check for the presence of an L3 cache setup by
-         * the firmware. If any, we disable NAP capability as
-         * it's known to be bogus on rev 2.1 and earlier
-         */
-        mfspr   r11,SPRN_L3CR
-        andis.  r11,r11,L3CR_L3E@h
-        beq     1f
-        lwz     r6,CPU_SPEC_FEATURES(r5)
-        andi.   r0,r6,CPU_FTR_L3_DISABLE_NAP
-        beq     1f
-        li      r7,CPU_FTR_CAN_NAP
-        andc    r6,r6,r7
-        stw     r6,CPU_SPEC_FEATURES(r5)
-1:
-        mfspr   r11,SPRN_HID0
-
-        /* All of the bits we have to set.....
-         */
-        ori     r11,r11,HID0_SGE | HID0_FOLD | HID0_BHTE
-        ori     r11,r11,HID0_LRSTK | HID0_BTIC
-        oris    r11,r11,HID0_DPM@h
-BEGIN_FTR_SECTION
-        xori    r11,r11,HID0_BTIC
-END_FTR_SECTION_IFSET(CPU_FTR_NO_BTIC)
-BEGIN_FTR_SECTION
-        xoris   r11,r11,HID0_DPM@h      /* disable dynamic power mgmt */
-END_FTR_SECTION_IFSET(CPU_FTR_NO_DPM)
-
-        /* All of the bits we have to clear....
-         */
-        li      r3,HID0_SPD | HID0_NOPDST | HID0_NOPTI
-        andc    r11,r11,r3              /* clear SPD: enable speculative */
-        li      r3,0
-
-        mtspr   SPRN_ICTC,r3            /* Instruction Cache Throttling off */
-        isync
-        mtspr   SPRN_HID0,r11
-        sync
-        isync
-
-        /* Enable L2 HW prefetch, if L2 is enabled
-         */
-        mfspr   r3,SPRN_L2CR
-        andis.  r3,r3,L2CR_L2E@h
-        beqlr
-        mfspr   r3,SPRN_MSSCR0
-        ori     r3,r3,3
-        sync
-        mtspr   SPRN_MSSCR0,r3
-        sync
-        isync
-        blr
-
-/*
- * Initialize the FPU registers. This is needed to work around an errata
- * in some 750 cpus where using a not yet initialized FPU register after
- * power on reset may hang the CPU
- */
-_GLOBAL(__init_fpu_registers)
-        mfmsr   r10
-        ori     r11,r10,MSR_FP
-        mtmsr   r11
-        isync
-        addis   r9,r3,empty_zero_page@ha
-        addi    r9,r9,empty_zero_page@l
-        REST_32FPRS(0,r9)
-        sync
-        mtmsr   r10
-        isync
-        blr
-
-
-/* Definitions for the table use to save CPU states */
-#define CS_HID0         0
-#define CS_HID1         4
-#define CS_HID2         8
-#define CS_MSSCR0       12
-#define CS_MSSSR0       16
-#define CS_ICTRL        20
-#define CS_LDSTCR       24
-#define CS_LDSTDB       28
-#define CS_SIZE         32
-
-        .data
-        .balign L1_CACHE_BYTES
-cpu_state_storage:
-        .space  CS_SIZE
-        .balign L1_CACHE_BYTES,0
-        .text
-
-/* Called in normal context to backup CPU 0 state. This
- * does not include cache settings. This function is also
- * called for machine sleep. This does not include the MMU
- * setup, BATs, etc... but rather the "special" registers
- * like HID0, HID1, MSSCR0, etc...
- */
-_GLOBAL(__save_cpu_setup)
-        /* Some CR fields are volatile, we back it up all */
-        mfcr    r7
-
-        /* Get storage ptr */
-        lis     r5,cpu_state_storage@h
-        ori     r5,r5,cpu_state_storage@l
-
-        /* Save HID0 (common to all CONFIG_6xx cpus) */
-        mfspr   r3,SPRN_HID0
-        stw     r3,CS_HID0(r5)
-
-        /* Now deal with CPU type dependent registers */
-        mfspr   r3,SPRN_PVR
-        srwi    r3,r3,16
-        cmplwi  cr0,r3,0x8000   /* 7450 */
-        cmplwi  cr1,r3,0x000c   /* 7400 */
-        cmplwi  cr2,r3,0x800c   /* 7410 */
-        cmplwi  cr3,r3,0x8001   /* 7455 */
-        cmplwi  cr4,r3,0x8002   /* 7457 */
-        cmplwi  cr5,r3,0x8003   /* 7447A */
-        cmplwi  cr6,r3,0x7000   /* 750FX */
-        cmplwi  cr7,r3,0x8004   /* 7448 */
-        /* cr1 is 7400 || 7410 */
-        cror    4*cr1+eq,4*cr1+eq,4*cr2+eq
-        /* cr0 is 74xx */
-        cror    4*cr0+eq,4*cr0+eq,4*cr3+eq
-        cror    4*cr0+eq,4*cr0+eq,4*cr4+eq
-        cror    4*cr0+eq,4*cr0+eq,4*cr1+eq
-        cror    4*cr0+eq,4*cr0+eq,4*cr5+eq
-        cror    4*cr0+eq,4*cr0+eq,4*cr7+eq
-        bne     1f
-        /* Backup 74xx specific regs */
-        mfspr   r4,SPRN_MSSCR0
-        stw     r4,CS_MSSCR0(r5)
-        mfspr   r4,SPRN_MSSSR0
-        stw     r4,CS_MSSSR0(r5)
-        beq     cr1,1f
-        /* Backup 745x specific registers */
-        mfspr   r4,SPRN_HID1
-        stw     r4,CS_HID1(r5)
-        mfspr   r4,SPRN_ICTRL
-        stw     r4,CS_ICTRL(r5)
-        mfspr   r4,SPRN_LDSTCR
-        stw     r4,CS_LDSTCR(r5)
-        mfspr   r4,SPRN_LDSTDB
-        stw     r4,CS_LDSTDB(r5)
-1:
-        bne     cr6,1f
-        /* Backup 750FX specific registers */
-        mfspr   r4,SPRN_HID1
-        stw     r4,CS_HID1(r5)
-        /* If rev 2.x, backup HID2 */
-        mfspr   r3,SPRN_PVR
-        andi.   r3,r3,0xff00
-        cmpwi   cr0,r3,0x0200
-        bne     1f
-        mfspr   r4,SPRN_HID2
-        stw     r4,CS_HID2(r5)
-1:
-        mtcr    r7
-        blr
-
-/* Called with no MMU context (typically MSR:IR/DR off) to
- * restore CPU state as backed up by the previous
- * function. This does not include cache setting
- */
-_GLOBAL(__restore_cpu_setup)
-        /* Some CR fields are volatile, we back it up all */
-        mfcr    r7
-
-        /* Get storage ptr */
-        lis     r5,(cpu_state_storage-KERNELBASE)@h
-        ori     r5,r5,cpu_state_storage@l
-
-        /* Restore HID0 */
-        lwz     r3,CS_HID0(r5)
-        sync
-        isync
-        mtspr   SPRN_HID0,r3
-        sync
-        isync
-
-        /* Now deal with CPU type dependent registers */
-        mfspr   r3,SPRN_PVR
-        srwi    r3,r3,16
-        cmplwi  cr0,r3,0x8000   /* 7450 */
-        cmplwi  cr1,r3,0x000c   /* 7400 */
-        cmplwi  cr2,r3,0x800c   /* 7410 */
-        cmplwi  cr3,r3,0x8001   /* 7455 */
-        cmplwi  cr4,r3,0x8002   /* 7457 */
-        cmplwi  cr5,r3,0x8003   /* 7447A */
-        cmplwi  cr6,r3,0x7000   /* 750FX */
-        cmplwi  cr7,r3,0x8004   /* 7448 */
-        /* cr1 is 7400 || 7410 */
-        cror    4*cr1+eq,4*cr1+eq,4*cr2+eq
-        /* cr0 is 74xx */
-        cror    4*cr0+eq,4*cr0+eq,4*cr3+eq
-        cror    4*cr0+eq,4*cr0+eq,4*cr4+eq
-        cror    4*cr0+eq,4*cr0+eq,4*cr1+eq
-        cror    4*cr0+eq,4*cr0+eq,4*cr5+eq
-        cror    4*cr0+eq,4*cr0+eq,4*cr7+eq
-        bne     2f
-        /* Restore 74xx specific regs */
-        lwz     r4,CS_MSSCR0(r5)
-        sync
-        mtspr   SPRN_MSSCR0,r4
-        sync
-        isync
-        lwz     r4,CS_MSSSR0(r5)
-        sync
-        mtspr   SPRN_MSSSR0,r4
-        sync
-        isync
-        bne     cr2,1f
-        /* Clear 7410 L2CR2 */
-        li      r4,0
-        mtspr   SPRN_L2CR2,r4
-1:      beq     cr1,2f
-        /* Restore 745x specific registers */
-        lwz     r4,CS_HID1(r5)
-        sync
-        mtspr   SPRN_HID1,r4
-        isync
-        sync
-        lwz     r4,CS_ICTRL(r5)
-        sync
-        mtspr   SPRN_ICTRL,r4
-        isync
-        sync
-        lwz     r4,CS_LDSTCR(r5)
-        sync
-        mtspr   SPRN_LDSTCR,r4
-        isync
-        sync
-        lwz     r4,CS_LDSTDB(r5)
-        sync
-        mtspr   SPRN_LDSTDB,r4
-        isync
-        sync
-2:      bne     cr6,1f
-        /* Restore 750FX specific registers
-         * that is restore HID2 on rev 2.x and PLL config & switch
-         * to PLL 0 on all
-         */
-        /* If rev 2.x, restore HID2 with low voltage bit cleared */
-        mfspr   r3,SPRN_PVR
-        andi.   r3,r3,0xff00
-        cmpwi   cr0,r3,0x0200
-        bne     4f
-        lwz     r4,CS_HID2(r5)
-        rlwinm  r4,r4,0,19,17
-        mtspr   SPRN_HID2,r4
-        sync
-4:
-        lwz     r4,CS_HID1(r5)
-        rlwinm  r5,r4,0,16,14
-        mtspr   SPRN_HID1,r5
-                /* Wait for PLL to stabilize */
-        mftbl   r5
-3:      mftbl   r6
-        sub     r6,r6,r5
-        cmplwi  cr0,r6,10000
-        ble     3b
-        /* Setup final PLL */
-        mtspr   SPRN_HID1,r4
-1:
-        mtcr    r7
-        blr
-
diff --git a/arch/ppc/kernel/dma-mapping.c b/arch/ppc/kernel/dma-mapping.c
index 685fd0defe23..61465ec88bc7 100644
--- a/arch/ppc/kernel/dma-mapping.c
+++ b/arch/ppc/kernel/dma-mapping.c
@@ -223,6 +223,8 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
                 pte_t *pte = consistent_pte + CONSISTENT_OFFSET(vaddr);
                 struct page *end = page + (1 << order);
 
+                split_page(page, order);
+
                 /*
                  * Set the "dma handle"
                  */
@@ -231,7 +233,6 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
                 do {
                         BUG_ON(!pte_none(*pte));
 
-                        set_page_count(page, 1);
                         SetPageReserved(page);
                         set_pte_at(&init_mm, vaddr,
                                    pte, mk_pte(page, pgprot_noncached(PAGE_KERNEL)));
@@ -244,7 +245,6 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
                  * Free the otherwise unused pages.
                  */
                 while (page < end) {
-                        set_page_count(page, 1);
                         __free_page(page);
                         page++;
                 }
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S
index 3a2815978488..5891ecbdc703 100644
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
@@ -135,10 +135,10 @@ transfer_to_handler:
         mfspr   r11,SPRN_HID0
         mtcr    r11
 BEGIN_FTR_SECTION
-        bt-     8,power_save_6xx_restore        /* Check DOZE */
+        bt-     8,4f                    /* Check DOZE */
 END_FTR_SECTION_IFSET(CPU_FTR_CAN_DOZE)
 BEGIN_FTR_SECTION
-        bt-     9,power_save_6xx_restore        /* Check NAP */
+        bt-     9,4f                    /* Check NAP */
 END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
 #endif /* CONFIG_6xx */
         .globl transfer_to_handler_cont
@@ -157,6 +157,10 @@ transfer_to_handler_cont:
         SYNC
         RFI                             /* jump to handler, enable MMU */
 
+#ifdef CONFIG_6xx
+4:      b       power_save_6xx_restore
+#endif
+
 /*
  * On kernel stack overflow, load up an initial stack pointer
  * and call StackOverflow(regs), which should not return.
@@ -926,55 +930,3 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
         b       4b
 
         .comm   ee_restarts,4
-
-/*
- * PROM code for specific machines follows.  Put it
- * here so it's easy to add arch-specific sections later.
- * -- Cort
- */
-#ifdef CONFIG_PPC_OF
-/*
- * On CHRP, the Run-Time Abstraction Services (RTAS) have to be
- * called with the MMU off.
- */
-_GLOBAL(enter_rtas)
-        stwu    r1,-INT_FRAME_SIZE(r1)
-        mflr    r0
-        stw     r0,INT_FRAME_SIZE+4(r1)
-        lis     r4,rtas_data@ha
-        lwz     r4,rtas_data@l(r4)
-        lis     r6,1f@ha        /* physical return address for rtas */
-        addi    r6,r6,1f@l
-        tophys(r6,r6)
-        tophys(r7,r1)
-        lis     r8,rtas_entry@ha
-        lwz     r8,rtas_entry@l(r8)
-        mfmsr   r9
-        stw     r9,8(r1)
-        LOAD_MSR_KERNEL(r0,MSR_KERNEL)
-        SYNC                    /* disable interrupts so SRR0/1 */
-        MTMSRD(r0)              /* don't get trashed */
-        li      r9,MSR_KERNEL & ~(MSR_IR|MSR_DR)
-        mtlr    r6
-        CLR_TOP32(r7)
-        mtspr   SPRN_SPRG2,r7
-        mtspr   SPRN_SRR0,r8
-        mtspr   SPRN_SRR1,r9
-        RFI
-1:      tophys(r9,r1)
-        lwz     r8,INT_FRAME_SIZE+4(r9) /* get return address */
-        lwz     r9,8(r9)        /* original msr value */
-        FIX_SRR1(r9,r0)
-        addi    r1,r1,INT_FRAME_SIZE
-        li      r0,0
-        mtspr   SPRN_SPRG2,r0
-        mtspr   SPRN_SRR0,r8
-        mtspr   SPRN_SRR1,r9
-        RFI                     /* return to caller */
-
-        .globl  machine_check_in_rtas
-machine_check_in_rtas:
-        twi     31,0,0
-        /* XXX load up BATs and panic */
-
-#endif /* CONFIG_PPC_OF */
diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S
index 53ea845fb911..01303efeddad 100644
--- a/arch/ppc/kernel/head.S
+++ b/arch/ppc/kernel/head.S
@@ -37,19 +37,6 @@
 #include <asm/amigappc.h>
 #endif
 
-#ifdef CONFIG_PPC64BRIDGE
-#define LOAD_BAT(n, reg, RA, RB)        \
-        ld      RA,(n*32)+0(reg);       \
-        ld      RB,(n*32)+8(reg);       \
-        mtspr   SPRN_IBAT##n##U,RA;     \
-        mtspr   SPRN_IBAT##n##L,RB;     \
-        ld      RA,(n*32)+16(reg);      \
-        ld      RB,(n*32)+24(reg);      \
-        mtspr   SPRN_DBAT##n##U,RA;     \
-        mtspr   SPRN_DBAT##n##L,RB;     \
-
-#else /* CONFIG_PPC64BRIDGE */
-
 /* 601 only have IBAT; cr0.eq is set on 601 when using this macro */
 #define LOAD_BAT(n, reg, RA, RB)        \
         /* see the comment for clear_bats() -- Cort */ \
@@ -66,7 +53,6 @@
         mtspr   SPRN_DBAT##n##U,RA;     \
         mtspr   SPRN_DBAT##n##L,RB;     \
 1:
-#endif /* CONFIG_PPC64BRIDGE */
 
         .text
         .stabs  "arch/ppc/kernel/",N_SO,0,0,0f
@@ -129,11 +115,6 @@ _start:
 
         .globl  __start
 __start:
-/*
- * We have to do any OF calls before we map ourselves to KERNELBASE,
- * because OF may have I/O devices mapped into that area
- * (particularly on CHRP).
- */
         mr      r31,r3                  /* save parameters */
         mr      r30,r4
         mr      r29,r5
@@ -148,14 +129,6 @@ __start:
  */
         bl      early_init
 
-/*
- * On POWER4, we first need to tweak some CPU configuration registers
- * like real mode cache inhibit or exception base
- */
-#ifdef CONFIG_POWER4
-        bl      __970_cpu_preinit
-#endif /* CONFIG_POWER4 */
-
 #ifdef CONFIG_APUS
 /* On APUS the __va/__pa constants need to be set to the correct
  * values before continuing.
@@ -169,7 +142,6 @@ __start:
  */
         bl      mmu_off
 __after_mmu_off:
-#ifndef CONFIG_POWER4
         bl      clear_bats
         bl      flush_tlbs
 
@@ -177,10 +149,6 @@ __after_mmu_off:
 #if !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT)
         bl      setup_disp_bat
 #endif
-#else /* CONFIG_POWER4 */
-        bl      reloc_offset
-        bl      initial_mm_power4
-#endif /* CONFIG_POWER4 */
 
 /*
  * Call setup_cpu for CPU 0 and initialize 6xx Idle
@@ -192,18 +160,11 @@ __after_mmu_off:
         bl      reloc_offset
         bl      init_idle_6xx
 #endif /* CONFIG_6xx */
-#ifdef CONFIG_POWER4
-        bl      reloc_offset
-        bl      init_idle_power4
-#endif /* CONFIG_POWER4 */
 
 
 #ifndef CONFIG_APUS
 /*
  * We need to run with _start at physical address 0.
- * On CHRP, we are loaded at 0x10000 since OF on CHRP uses
- * the exception vectors at 0 (and therefore this copy
- * overwrites OF's exception vectors with our own).
  * If the MMU is already turned on, we copy stuff to KERNELBASE,
  * otherwise we copy it to 0.
  */
@@ -358,51 +319,19 @@ i##n:								\
 #endif
 
 /* Machine check */
-/*
- * On CHRP, this is complicated by the fact that we could get a
- * machine check inside RTAS, and we have no guarantee that certain
- * critical registers will have the values we expect.  The set of
- * registers that might have bad values includes all the GPRs
- * and all the BATs.  We indicate that we are in RTAS by putting
- * a non-zero value, the address of the exception frame to use,
- * in SPRG2.  The machine check handler checks SPRG2 and uses its
- * value if it is non-zero.  If we ever needed to free up SPRG2,
- * we could use a field in the thread_info or thread_struct instead.
- * (Other exception handlers assume that r1 is a valid kernel stack
- * pointer when we take an exception from supervisor mode.)
- *      -- paulus.
- */
         . = 0x200
         mtspr   SPRN_SPRG0,r10
         mtspr   SPRN_SPRG1,r11
         mfcr    r10
-#ifdef CONFIG_PPC_CHRP
-        mfspr   r11,SPRN_SPRG2
-        cmpwi   0,r11,0
-        bne     7f
-#endif /* CONFIG_PPC_CHRP */
         EXCEPTION_PROLOG_1
 7:      EXCEPTION_PROLOG_2
         addi    r3,r1,STACK_FRAME_OVERHEAD
-#ifdef CONFIG_PPC_CHRP
-        mfspr   r4,SPRN_SPRG2
-        cmpwi   cr1,r4,0
-        bne     cr1,1f
-#endif
         EXC_XFER_STD(0x200, machine_check_exception)
-#ifdef CONFIG_PPC_CHRP
-1:      b       machine_check_in_rtas
-#endif
 
 /* Data access exception. */
         . = 0x300
-#ifdef CONFIG_PPC64BRIDGE
-        b       DataAccess
-DataAccessCont:
-#else
 DataAccess:
         EXCEPTION_PROLOG
-#endif /* CONFIG_PPC64BRIDGE */
         mfspr   r10,SPRN_DSISR
         andis.  r0,r10,0xa470           /* weird error? */
         bne     1f                      /* if not, try to put a PTE */
@@ -414,21 +343,10 @@ DataAccess:
         mfspr   r4,SPRN_DAR
         EXC_XFER_EE_LITE(0x300, handle_page_fault)
 
-#ifdef CONFIG_PPC64BRIDGE
-/* SLB fault on data access. */
-        . = 0x380
-        b       DataSegment
-#endif /* CONFIG_PPC64BRIDGE */
-
 /* Instruction access exception. */
         . = 0x400
-#ifdef CONFIG_PPC64BRIDGE
-        b       InstructionAccess
-InstructionAccessCont:
-#else
 InstructionAccess:
         EXCEPTION_PROLOG
-#endif /* CONFIG_PPC64BRIDGE */
         andis.  r0,r9,0x4000            /* no pte found? */
         beq     1f                      /* if so, try to put a PTE */
         li      r3,0                    /* into the hash table */
@@ -438,12 +356,6 @@ InstructionAccess:
         mr      r5,r9
         EXC_XFER_EE_LITE(0x400, handle_page_fault)
 
-#ifdef CONFIG_PPC64BRIDGE
-/* SLB fault on instruction access. */
-        . = 0x480
-        b       InstructionSegment
-#endif /* CONFIG_PPC64BRIDGE */
-
 /* External interrupt */
         EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE)
 
@@ -708,15 +620,9 @@ DataStoreTLBMiss:
         EXCEPTION(0x1300, Trap_13, instruction_breakpoint_exception, EXC_XFER_EE)
         EXCEPTION(0x1400, SMI, SMIException, EXC_XFER_EE)
         EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_EE)
-#ifdef CONFIG_POWER4
-        EXCEPTION(0x1600, Trap_16, unknown_exception, EXC_XFER_EE)
-        EXCEPTION(0x1700, Trap_17, altivec_assist_exception, EXC_XFER_EE)
-        EXCEPTION(0x1800, Trap_18, TAUException, EXC_XFER_STD)
-#else /* !CONFIG_POWER4 */
         EXCEPTION(0x1600, Trap_16, altivec_assist_exception, EXC_XFER_EE)
         EXCEPTION(0x1700, Trap_17, TAUException, EXC_XFER_STD)
         EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_EE)
-#endif /* CONFIG_POWER4 */
         EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_EE)
         EXCEPTION(0x1a00, Trap_1a, unknown_exception, EXC_XFER_EE)
         EXCEPTION(0x1b00, Trap_1b, unknown_exception, EXC_XFER_EE)
@@ -754,28 +660,6 @@ AltiVecUnavailable:
         addi    r3,r1,STACK_FRAME_OVERHEAD
         EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception)
 
-#ifdef CONFIG_PPC64BRIDGE
-DataAccess:
-        EXCEPTION_PROLOG
-        b       DataAccessCont
-
-InstructionAccess:
-        EXCEPTION_PROLOG
-        b       InstructionAccessCont
-
-DataSegment:
-        EXCEPTION_PROLOG
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        mfspr   r4,SPRN_DAR
-        stw     r4,_DAR(r11)
-        EXC_XFER_STD(0x380, unknown_exception)
-
-InstructionSegment:
-        EXCEPTION_PROLOG
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        EXC_XFER_STD(0x480, unknown_exception)
-#endif /* CONFIG_PPC64BRIDGE */
-
 #ifdef CONFIG_ALTIVEC
 /* Note that the AltiVec support is closely modeled after the FP
  * support.  Changes to one are likely to be applicable to the
@@ -1048,13 +932,6 @@ __secondary_start_pmac_0:
 
         .globl  __secondary_start
 __secondary_start:
-#ifdef CONFIG_PPC64BRIDGE
-        mfmsr   r0
-        clrldi  r0,r0,1                 /* make sure it's in 32-bit mode */
-        SYNC
-        MTMSRD(r0)
-        isync
-#endif
         /* Copy some CPU settings from CPU 0 */
         bl      __restore_cpu_setup
 
@@ -1065,10 +942,6 @@ __secondary_start:
         lis     r3,-KERNELBASE@h
         bl      init_idle_6xx
 #endif /* CONFIG_6xx */
-#ifdef CONFIG_POWER4
-        lis     r3,-KERNELBASE@h
-        bl      init_idle_power4
-#endif /* CONFIG_POWER4 */
 
         /* get current_thread_info and current */
         lis     r1,secondary_ti@ha
@@ -1109,12 +982,12 @@ __secondary_start:
  * Those generic dummy functions are kept for CPUs not
  * included in CONFIG_6xx
  */
-#if !defined(CONFIG_6xx) && !defined(CONFIG_POWER4)
+#if !defined(CONFIG_6xx)
 _GLOBAL(__save_cpu_setup)
         blr
 _GLOBAL(__restore_cpu_setup)
         blr
-#endif /* !defined(CONFIG_6xx) && !defined(CONFIG_POWER4) */
+#endif /* !defined(CONFIG_6xx) */
 
 
 /*
@@ -1132,11 +1005,6 @@ load_up_mmu:
         tophys(r6,r6)
         lwz     r6,_SDR1@l(r6)
         mtspr   SPRN_SDR1,r6
-#ifdef CONFIG_PPC64BRIDGE
-        /* clear the ASR so we only use the pseudo-segment registers. */
-        li      r6,0
-        mtasr   r6
-#endif /* CONFIG_PPC64BRIDGE */
         li      r0,16           /* load up segment register values */
         mtctr   r0              /* for context 0 */
         lis     r3,0x2000       /* Ku = 1, VSID = 0 */
@@ -1145,7 +1013,7 @@ load_up_mmu:
         addi    r3,r3,0x111     /* increment VSID */
         addis   r4,r4,0x1000    /* address of next segment */
         bdnz    3b
-#ifndef CONFIG_POWER4
+
 /* Load the BAT registers with the values set up by MMU_init.
    MMU_init takes care of whether we're on a 601 or not. */
         mfpvr   r3
@@ -1158,7 +1026,7 @@ load_up_mmu:
         LOAD_BAT(1,r3,r4,r5)
         LOAD_BAT(2,r3,r4,r5)
         LOAD_BAT(3,r3,r4,r5)
-#endif /* CONFIG_POWER4 */
+
         blr
 
 /*
@@ -1269,9 +1137,6 @@ _GLOBAL(set_context)
         li      r4,0
         isync
 3:
-#ifdef CONFIG_PPC64BRIDGE
-        slbie   r4
-#endif /* CONFIG_PPC64BRIDGE */
         mtsrin  r3,r4
         addi    r3,r3,0x111     /* next VSID */
         rlwinm  r3,r3,0,8,3     /* clear out any overflow from VSID field */
@@ -1358,7 +1223,6 @@ mmu_off:
         sync
         RFI
 
-#ifndef CONFIG_POWER4
 /*
  * Use the first pair of BAT registers to map the 1st 16MB
  * of RAM to KERNELBASE.  From this point on we can't safely
@@ -1366,7 +1230,6 @@ mmu_off:
  */
 initial_bats:
         lis     r11,KERNELBASE@h
-#ifndef CONFIG_PPC64BRIDGE
         mfspr   r9,SPRN_PVR
         rlwinm  r9,r9,16,16,31          /* r9 = 1 for 601, 4 for 604 */
         cmpwi   0,r9,1
@@ -1381,7 +1244,6 @@ initial_bats:
         mtspr   SPRN_IBAT1L,r10
         isync
         blr
-#endif /* CONFIG_PPC64BRIDGE */
 
 4:      tophys(r8,r11)
 #ifdef CONFIG_SMP
@@ -1395,11 +1257,6 @@ initial_bats:
         ori     r11,r11,BL_256M<<2|0x2  /* set up BAT registers for 604 */
 #endif /* CONFIG_APUS */
 
-#ifdef CONFIG_PPC64BRIDGE
-        /* clear out the high 32 bits in the BAT */
-        clrldi  r11,r11,32
-        clrldi  r8,r8,32
-#endif /* CONFIG_PPC64BRIDGE */
         mtspr   SPRN_DBAT0L,r8          /* N.B. 6xx (not 601) have valid */
         mtspr   SPRN_DBAT0U,r11         /* bit in upper BAT register */
         mtspr   SPRN_IBAT0L,r8
@@ -1432,38 +1289,6 @@ setup_disp_bat:
 
 #endif /* !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT) */
 
-#else /* CONFIG_POWER4 */
-/*
- * Load up the SDR1 and segment register values now
- * since we don't have the BATs.
- * Also make sure we are running in 32-bit mode.
- */
-
-initial_mm_power4:
-        addis   r14,r3,_SDR1@ha         /* get the value from _SDR1 */
-        lwz     r14,_SDR1@l(r14)        /* assume hash table below 4GB */
-        mtspr   SPRN_SDR1,r14
-        slbia
-        lis     r4,0x2000               /* set pseudo-segment reg 12 */
-        ori     r5,r4,0x0ccc
-        mtsr    12,r5
-#if 0
-        ori     r5,r4,0x0888            /* set pseudo-segment reg 8 */
-        mtsr    8,r5                    /* (for access to serial port) */
-#endif
-#ifdef CONFIG_BOOTX_TEXT
-        ori     r5,r4,0x0999            /* set pseudo-segment reg 9 */
-        mtsr    9,r5                    /* (for access to screen) */
-#endif
-        mfmsr   r0
-        clrldi  r0,r0,1
-        sync
-        mtmsr   r0
-        isync
-        blr
-
-#endif /* CONFIG_POWER4 */
-
 #ifdef CONFIG_8260
 /* Jump into the system reset for the rom.
  * We first disable the MMU, and then jump to the ROM reset address.
diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S
index 677c571aa276..0d8b88219d38 100644
--- a/arch/ppc/kernel/head_44x.S
+++ b/arch/ppc/kernel/head_44x.S
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/head_44x.S
- *
  * Kernel execution entry point code.
  *
  *    Copyright (c) 1995-1996 Gary Thomas <gdt@linuxppc.org>
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S
index c1e89ad0684d..ec53c7d65f2b 100644
--- a/arch/ppc/kernel/head_8xx.S
+++ b/arch/ppc/kernel/head_8xx.S
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/kernel/except_8xx.S
- *
  *  PowerPC version
  *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
  *  Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP
diff --git a/arch/ppc/kernel/head_fsl_booke.S b/arch/ppc/kernel/head_fsl_booke.S
index 8d60fa99fc4b..dd86bbed7627 100644
--- a/arch/ppc/kernel/head_fsl_booke.S
+++ b/arch/ppc/kernel/head_fsl_booke.S
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/head_fsl_booke.S
- *
  * Kernel execution entry point code.
  *
  *    Copyright (c) 1995-1996 Gary Thomas <gdt@linuxppc.org>
@@ -316,6 +314,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
          */
         lis     r2,DBCR0_IDM@h
         mtspr   SPRN_DBCR0,r2
+        isync
         /* clear any residual debug events */
         li      r2,-1
         mtspr   SPRN_DBSR,r2
@@ -1002,12 +1001,15 @@ _GLOBAL(giveup_fpu)
 _GLOBAL(abort)
         li      r13,0
         mtspr   SPRN_DBCR0,r13          /* disable all debug events */
+        isync
         mfmsr   r13
         ori     r13,r13,MSR_DE@l        /* Enable Debug Events */
         mtmsr   r13
+        isync
         mfspr   r13,SPRN_DBCR0
         lis     r13,(DBCR0_IDM|DBCR0_RST_CHIP)@h
         mtspr   SPRN_DBCR0,r13
+        isync
 
 _GLOBAL(set_context)
 
diff --git a/arch/ppc/kernel/idle.c b/arch/ppc/kernel/idle.c
deleted file mode 100644
index 1be3ca5bae40..000000000000
--- a/arch/ppc/kernel/idle.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Idle daemon for PowerPC.  Idle daemon will handle any action
- * that needs to be taken when the system becomes idle.
- *
- * Written by Cort Dougan (cort@cs.nmt.edu).  Subsequently hacked
- * on by Tom Rini, Armin Kuster, Paul Mackerras and others.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <linux/config.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/stddef.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/sysctl.h>
-#include <linux/cpu.h>
-
-#include <asm/pgtable.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/mmu.h>
-#include <asm/cache.h>
-#include <asm/cputable.h>
-#include <asm/machdep.h>
-#include <asm/smp.h>
-
-void default_idle(void)
-{
-        void (*powersave)(void);
-
-        powersave = ppc_md.power_save;
-
-        if (!need_resched()) {
-                if (powersave != NULL)
-                        powersave();
-#ifdef CONFIG_SMP
-                else {
-                        set_thread_flag(TIF_POLLING_NRFLAG);
-                        while (!need_resched() &&
-                                        !cpu_is_offline(smp_processor_id()))
-                                barrier();
-                        clear_thread_flag(TIF_POLLING_NRFLAG);
-                }
-#endif
-        }
-}
-
-/*
- * The body of the idle task.
- */
-void cpu_idle(void)
-{
-        int cpu = smp_processor_id();
-
-        for (;;) {
-                while (!need_resched()) {
-                        if (ppc_md.idle != NULL)
-                                ppc_md.idle();
-                        else
-                                default_idle();
-                }
-
-                if (cpu_is_offline(cpu) && system_state == SYSTEM_RUNNING)
-                        cpu_die();
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
-        }
-}
-
-#if defined(CONFIG_SYSCTL) && defined(CONFIG_6xx)
-/*
- * Register the sysctl to set/clear powersave_nap.
- */
-extern int powersave_nap;
-
-static ctl_table powersave_nap_ctl_table[]={
-        {
-                .ctl_name       = KERN_PPC_POWERSAVE_NAP,
-                .procname       = "powersave-nap",
-                .data           = &powersave_nap,
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
-        },
-        { 0, },
-};
-static ctl_table powersave_nap_sysctl_root[] = {
-        { 1, "kernel", NULL, 0, 0755, powersave_nap_ctl_table, },
-        { 0,},
-};
-
-static int __init
-register_powersave_nap_sysctl(void)
-{
-        register_sysctl_table(powersave_nap_sysctl_root, 0);
-
-        return 0;
-}
-
-__initcall(register_powersave_nap_sysctl);
-#endif
diff --git a/arch/ppc/kernel/idle_6xx.S b/arch/ppc/kernel/idle_6xx.S
deleted file mode 100644
index 1a2194cf6828..000000000000
--- a/arch/ppc/kernel/idle_6xx.S
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- *  This file contains the power_save function for 6xx & 7xxx CPUs
- *  rewritten in assembler
- *
- *  Warning ! This code assumes that if your machine has a 750fx
- *  it will have PLL 1 set to low speed mode (used during NAP/DOZE).
- *  if this is not the case some additional changes will have to
- *  be done to check a runtime var (a bit like powersave-nap)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
- */
-
-#include <linux/config.h>
-#include <linux/threads.h>
-#include <asm/processor.h>
-#include <asm/page.h>
-#include <asm/cputable.h>
-#include <asm/thread_info.h>
-#include <asm/ppc_asm.h>
-#include <asm/asm-offsets.h>
-
-#undef DEBUG
-
-        .text
-
-/*
- * Init idle, called at early CPU setup time from head.S for each CPU
- * Make sure no rest of NAP mode remains in HID0, save default
- * values for some CPU specific registers. Called with r24
- * containing CPU number and r3 reloc offset
- */
-_GLOBAL(init_idle_6xx)
-BEGIN_FTR_SECTION
-        mfspr   r4,SPRN_HID0
-        rlwinm  r4,r4,0,10,8    /* Clear NAP */
-        mtspr   SPRN_HID0, r4
-        b       1f
-END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
-        blr
-1:
-        slwi    r5,r24,2
-        add     r5,r5,r3
-BEGIN_FTR_SECTION
-        mfspr   r4,SPRN_MSSCR0
-        addis   r6,r5, nap_save_msscr0@ha
-        stw     r4,nap_save_msscr0@l(r6)
-END_FTR_SECTION_IFSET(CPU_FTR_NAP_DISABLE_L2_PR)
-BEGIN_FTR_SECTION
-        mfspr   r4,SPRN_HID1
-        addis   r6,r5,nap_save_hid1@ha
-        stw     r4,nap_save_hid1@l(r6)
-END_FTR_SECTION_IFSET(CPU_FTR_DUAL_PLL_750FX)
-        blr
-
-/*
- * Here is the power_save_6xx function. This could eventually be
- * split into several functions & changing the function pointer
- * depending on the various features.
- */
-_GLOBAL(ppc6xx_idle)
-        /* Check if we can nap or doze, put HID0 mask in r3
-         */
-        lis     r3, 0
-BEGIN_FTR_SECTION
-        lis     r3,HID0_DOZE@h
-END_FTR_SECTION_IFSET(CPU_FTR_CAN_DOZE)
-BEGIN_FTR_SECTION
-        /* We must dynamically check for the NAP feature as it
-         * can be cleared by CPU init after the fixups are done
-         */
-        lis     r4,cur_cpu_spec@ha
-        lwz     r4,cur_cpu_spec@l(r4)
-        lwz     r4,CPU_SPEC_FEATURES(r4)
-        andi.   r0,r4,CPU_FTR_CAN_NAP
-        beq     1f
-        /* Now check if user or arch enabled NAP mode */
-        lis     r4,powersave_nap@ha
-        lwz     r4,powersave_nap@l(r4)
-        cmpwi   0,r4,0
-        beq     1f
-        lis     r3,HID0_NAP@h
-1:      
-END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
-        cmpwi   0,r3,0
-        beqlr
-
-        /* Clear MSR:EE */
-        mfmsr   r7
-        rlwinm  r0,r7,0,17,15
-        mtmsr   r0
-
-        /* Check current_thread_info()->flags */
-        rlwinm  r4,r1,0,0,18
-        lwz     r4,TI_FLAGS(r4)
-        andi.   r0,r4,_TIF_NEED_RESCHED
-        beq     1f
-        mtmsr   r7      /* out of line this ? */
-        blr
-1:      
-        /* Some pre-nap cleanups needed on some CPUs */
-        andis.  r0,r3,HID0_NAP@h
-        beq     2f
-BEGIN_FTR_SECTION
-        /* Disable L2 prefetch on some 745x and try to ensure
-         * L2 prefetch engines are idle. As explained by errata
-         * text, we can't be sure they are, we just hope very hard
-         * that well be enough (sic !). At least I noticed Apple
-         * doesn't even bother doing the dcbf's here...
-         */
-        mfspr   r4,SPRN_MSSCR0
-        rlwinm  r4,r4,0,0,29
-        sync
-        mtspr   SPRN_MSSCR0,r4
-        sync
-        isync
-        lis     r4,KERNELBASE@h
-        dcbf    0,r4
-        dcbf    0,r4
-        dcbf    0,r4
-        dcbf    0,r4
-END_FTR_SECTION_IFSET(CPU_FTR_NAP_DISABLE_L2_PR)
-#ifdef DEBUG
-        lis     r6,nap_enter_count@ha
-        lwz     r4,nap_enter_count@l(r6)
-        addi    r4,r4,1
-        stw     r4,nap_enter_count@l(r6)
-#endif  
-2:
-BEGIN_FTR_SECTION
-        /* Go to low speed mode on some 750FX */
-        lis     r4,powersave_lowspeed@ha
-        lwz     r4,powersave_lowspeed@l(r4)
-        cmpwi   0,r4,0
-        beq     1f
-        mfspr   r4,SPRN_HID1
-        oris    r4,r4,0x0001
-        mtspr   SPRN_HID1,r4
-1:      
-END_FTR_SECTION_IFSET(CPU_FTR_DUAL_PLL_750FX)
-
-        /* Go to NAP or DOZE now */     
-        mfspr   r4,SPRN_HID0
-        lis     r5,(HID0_NAP|HID0_SLEEP)@h
-BEGIN_FTR_SECTION
-        oris    r5,r5,HID0_DOZE@h
-END_FTR_SECTION_IFSET(CPU_FTR_CAN_DOZE)
-        andc    r4,r4,r5
-        or      r4,r4,r3
-BEGIN_FTR_SECTION
-        oris    r4,r4,HID0_DPM@h        /* that should be done once for all  */
-END_FTR_SECTION_IFCLR(CPU_FTR_NO_DPM)
-        mtspr   SPRN_HID0,r4
-BEGIN_FTR_SECTION
-        DSSALL
-        sync
-END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
-        ori     r7,r7,MSR_EE /* Could be ommited (already set) */
-        oris    r7,r7,MSR_POW@h
-        sync
-        isync
-        mtmsr   r7
-        isync
-        sync
-        blr
-        
-/*
- * Return from NAP/DOZE mode, restore some CPU specific registers,
- * we are called with DR/IR still off and r2 containing physical
- * address of current.
- */
-_GLOBAL(power_save_6xx_restore)
-        mfspr   r11,SPRN_HID0
-        rlwinm. r11,r11,0,10,8  /* Clear NAP & copy NAP bit !state to cr1 EQ */
-        cror    4*cr1+eq,4*cr0+eq,4*cr0+eq
-BEGIN_FTR_SECTION
-        rlwinm  r11,r11,0,9,7   /* Clear DOZE */
-END_FTR_SECTION_IFSET(CPU_FTR_CAN_DOZE)
-        mtspr   SPRN_HID0, r11
-
-#ifdef DEBUG
-        beq     cr1,1f
-        lis     r11,(nap_return_count-KERNELBASE)@ha
-        lwz     r9,nap_return_count@l(r11)
-        addi    r9,r9,1
-        stw     r9,nap_return_count@l(r11)
-1:
-#endif
-        
-        rlwinm  r9,r1,0,0,18
-        tophys(r9,r9)
-        lwz     r11,TI_CPU(r9)
-        slwi    r11,r11,2
-        /* Todo make sure all these are in the same page
-         * and load r22 (@ha part + CPU offset) only once
-         */
-BEGIN_FTR_SECTION
-        beq     cr1,1f
-        addis   r9,r11,(nap_save_msscr0-KERNELBASE)@ha
-        lwz     r9,nap_save_msscr0@l(r9)
-        mtspr   SPRN_MSSCR0, r9
-        sync
-        isync
-1:
-END_FTR_SECTION_IFSET(CPU_FTR_NAP_DISABLE_L2_PR)
-BEGIN_FTR_SECTION
-        addis   r9,r11,(nap_save_hid1-KERNELBASE)@ha
-        lwz     r9,nap_save_hid1@l(r9)
-        mtspr   SPRN_HID1, r9
-END_FTR_SECTION_IFSET(CPU_FTR_DUAL_PLL_750FX)
-        b       transfer_to_handler_cont
-
-        .data
-
-_GLOBAL(nap_save_msscr0)
-        .space  4*NR_CPUS
-
-_GLOBAL(nap_save_hid1)
-        .space  4*NR_CPUS
-
-_GLOBAL(powersave_nap)
-        .long   0
-_GLOBAL(powersave_lowspeed)
-        .long   0
-
-#ifdef DEBUG
-_GLOBAL(nap_enter_count)
-        .space  4
-_GLOBAL(nap_return_count)
-        .space  4
-#endif
diff --git a/arch/ppc/kernel/idle_power4.S b/arch/ppc/kernel/idle_power4.S
deleted file mode 100644
index cc0d535365cd..000000000000
--- a/arch/ppc/kernel/idle_power4.S
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  This file contains the power_save function for 6xx & 7xxx CPUs
- *  rewritten in assembler
- *
- *  Warning ! This code assumes that if your machine has a 750fx
- *  it will have PLL 1 set to low speed mode (used during NAP/DOZE).
- *  if this is not the case some additional changes will have to
- *  be done to check a runtime var (a bit like powersave-nap)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
- */
-
-#include <linux/config.h>
-#include <linux/threads.h>
-#include <asm/processor.h>
-#include <asm/page.h>
-#include <asm/cputable.h>
-#include <asm/thread_info.h>
-#include <asm/ppc_asm.h>
-#include <asm/asm-offsets.h>
-
-#undef DEBUG
-
-        .text
-
-/*
- * Init idle, called at early CPU setup time from head.S for each CPU
- * So nothing for now. Called with r24 containing CPU number and r3
- * reloc offset
- */
-        .globl  init_idle_power4
-init_idle_power4:
-        blr
-
-/*
- * Here is the power_save_6xx function. This could eventually be
- * split into several functions & changing the function pointer
- * depending on the various features.
- */
-        .globl  power4_idle
-power4_idle:
-BEGIN_FTR_SECTION
-        blr
-END_FTR_SECTION_IFCLR(CPU_FTR_CAN_NAP)
-        /* We must dynamically check for the NAP feature as it
-         * can be cleared by CPU init after the fixups are done
-         */
-        lis     r4,cur_cpu_spec@ha
-        lwz     r4,cur_cpu_spec@l(r4)
-        lwz     r4,CPU_SPEC_FEATURES(r4)
-        andi.   r0,r4,CPU_FTR_CAN_NAP
-        beqlr
-        /* Now check if user or arch enabled NAP mode */
-        lis     r4,powersave_nap@ha
-        lwz     r4,powersave_nap@l(r4)
-        cmpwi   0,r4,0
-        beqlr
-
-        /* Clear MSR:EE */
-        mfmsr   r7
-        rlwinm  r0,r7,0,17,15
-        mtmsr   r0
-
-        /* Check current_thread_info()->flags */
-        rlwinm  r4,r1,0,0,18
-        lwz     r4,TI_FLAGS(r4)
-        andi.   r0,r4,_TIF_NEED_RESCHED
-        beq     1f
-        mtmsr   r7      /* out of line this ? */
-        blr
-1:      
-        /* Go to NAP now */     
-BEGIN_FTR_SECTION
-        DSSALL
-        sync
-END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
-        ori     r7,r7,MSR_EE /* Could be ommited (already set) */
-        oris    r7,r7,MSR_POW@h
-        sync
-        isync
-        mtmsr   r7
-        isync
-        sync
-        blr
-        
-        .globl powersave_nap
-powersave_nap:
-        .long   0
diff --git a/arch/ppc/kernel/l2cr.S b/arch/ppc/kernel/l2cr.S
deleted file mode 100644
index d7f4e982b539..000000000000
--- a/arch/ppc/kernel/l2cr.S
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
-        L2CR functions
-        Copyright © 1997-1998 by PowerLogix R & D, Inc.
-
-        This program is free software; you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation; either version 2 of the License, or
-        (at your option) any later version.
-
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        GNU General Public License for more details.
-
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-/*
-        Thur, Dec. 12, 1998.
-        - First public release, contributed by PowerLogix.
-        ***********
-        Sat, Aug. 7, 1999.
-        - Terry: Made sure code disabled interrupts before running. (Previously
-                        it was assumed interrupts were already disabled).
-        - Terry: Updated for tentative G4 support.  4MB of memory is now flushed
-                        instead of 2MB.  (Prob. only 3 is necessary).
-        - Terry: Updated for workaround to HID0[DPM] processor bug
-                        during global invalidates.
-        ***********
-        Thu, July 13, 2000.
-        - Terry: Added isync to correct for an errata.
-
-        22 August 2001.
-        - DanM: Finally added the 7450 patch I've had for the past
-                several months.  The L2CR is similar, but I'm going
-                to assume the user of this functions knows what they
-                are doing.
-
-        Author: Terry Greeniaus (tgree@phys.ualberta.ca)
-        Please e-mail updates to this file to me, thanks!
-*/
-#include <linux/config.h>
-#include <asm/processor.h>
-#include <asm/cputable.h>
-#include <asm/ppc_asm.h>
-#include <asm/cache.h>
-#include <asm/page.h>
-
-/* Usage:
-
-        When setting the L2CR register, you must do a few special
-        things.  If you are enabling the cache, you must perform a
-        global invalidate.  If you are disabling the cache, you must
-        flush the cache contents first.  This routine takes care of
-        doing these things.  When first enabling the cache, make sure
-        you pass in the L2CR you want, as well as passing in the
-        global invalidate bit set.  A global invalidate will only be
-        performed if the L2I bit is set in applyThis.  When enabling
-        the cache, you should also set the L2E bit in applyThis.  If
-        you want to modify the L2CR contents after the cache has been
-        enabled, the recommended procedure is to first call
-        __setL2CR(0) to disable the cache and then call it again with
-        the new values for L2CR.  Examples:
-
-        _setL2CR(0)             - disables the cache
-        _setL2CR(0xB3A04000)    - enables my G3 upgrade card:
-                                - L2E set to turn on the cache
-                                - L2SIZ set to 1MB
-                                - L2CLK set to 1:1
-                                - L2RAM set to pipelined synchronous late-write
-                                - L2I set to perform a global invalidation
-                                - L2OH set to 0.5 nS
-                                - L2DF set because this upgrade card
-                                  requires it
-
-        A similar call should work for your card.  You need to know
-        the correct setting for your card and then place them in the
-        fields I have outlined above.  Other fields support optional
-        features, such as L2DO which caches only data, or L2TS which
-        causes cache pushes from the L1 cache to go to the L2 cache
-        instead of to main memory.
-
-IMPORTANT:
-        Starting with the 7450, the bits in this register have moved
-        or behave differently.  The Enable, Parity Enable, Size,
-        and L2 Invalidate are the only bits that have not moved.
-        The size is read-only for these processors with internal L2
-        cache, and the invalidate is a control as well as status.
-                -- Dan
-
-*/
-/*
- * Summary: this procedure ignores the L2I bit in the value passed in,
- * flushes the cache if it was already enabled, always invalidates the
- * cache, then enables the cache if the L2E bit is set in the value
- * passed in.
- *   -- paulus.
- */
-_GLOBAL(_set_L2CR)
-        /* Make sure this is a 750 or 7400 chip */
-BEGIN_FTR_SECTION
-        li      r3,-1
-        blr
-END_FTR_SECTION_IFCLR(CPU_FTR_L2CR)
-
-        mflr    r9
-
-        /* Stop DST streams */
-BEGIN_FTR_SECTION
-        DSSALL
-        sync
-END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
-
-        /* Turn off interrupts and data relocation. */
-        mfmsr   r7              /* Save MSR in r7 */
-        rlwinm  r4,r7,0,17,15
-        rlwinm  r4,r4,0,28,26   /* Turn off DR bit */
-        sync
-        mtmsr   r4
-        isync
-
-        /* Before we perform the global invalidation, we must disable dynamic
-         * power management via HID0[DPM] to work around a processor bug where
-         * DPM can possibly interfere with the state machine in the processor
-         * that invalidates the L2 cache tags.
-         */
-        mfspr   r8,SPRN_HID0            /* Save HID0 in r8 */
-        rlwinm  r4,r8,0,12,10           /* Turn off HID0[DPM] */
-        sync
-        mtspr   SPRN_HID0,r4            /* Disable DPM */
-        sync
-
-        /* Get the current enable bit of the L2CR into r4 */
-        mfspr   r4,SPRN_L2CR
-
-        /* Tweak some bits */
-        rlwinm  r5,r3,0,0,0             /* r5 contains the new enable bit */
-        rlwinm  r3,r3,0,11,9            /* Turn off the invalidate bit */
-        rlwinm  r3,r3,0,1,31            /* Turn off the enable bit */
-
-        /* Check to see if we need to flush */
-        rlwinm. r4,r4,0,0,0
-        beq     2f
-
-        /* Flush the cache. First, read the first 4MB of memory (physical) to
-         * put new data in the cache.  (Actually we only need
-         * the size of the L2 cache plus the size of the L1 cache, but 4MB will
-         * cover everything just to be safe).
-         */
-
-         /**** Might be a good idea to set L2DO here - to prevent instructions
-               from getting into the cache.  But since we invalidate
-               the next time we enable the cache it doesn't really matter.
-               Don't do this unless you accomodate all processor variations.
-               The bit moved on the 7450.....
-          ****/
-
-BEGIN_FTR_SECTION
-        /* Disable L2 prefetch on some 745x and try to ensure
-         * L2 prefetch engines are idle. As explained by errata
-         * text, we can't be sure they are, we just hope very hard
-         * that well be enough (sic !). At least I noticed Apple
-         * doesn't even bother doing the dcbf's here...
-         */
-        mfspr   r4,SPRN_MSSCR0
-        rlwinm  r4,r4,0,0,29
-        sync
-        mtspr   SPRN_MSSCR0,r4
-        sync
-        isync
-        lis     r4,KERNELBASE@h
-        dcbf    0,r4
-        dcbf    0,r4
-        dcbf    0,r4
-        dcbf    0,r4
-END_FTR_SECTION_IFSET(CPU_FTR_SPEC7450)
-
-        /* TODO: use HW flush assist when available */
-
-        lis     r4,0x0002
-        mtctr   r4
-        li      r4,0
-1:
-        lwzx    r0,r0,r4
-        addi    r4,r4,32                /* Go to start of next cache line */
-        bdnz    1b
-        isync
-
-        /* Now, flush the first 4MB of memory */
-        lis     r4,0x0002
-        mtctr   r4
-        li      r4,0
-        sync
-1:
-        dcbf    0,r4
-        addi    r4,r4,32                /* Go to start of next cache line */
-        bdnz    1b
-
-2:
-        /* Set up the L2CR configuration bits (and switch L2 off) */
-        /* CPU errata: Make sure the mtspr below is already in the
-         * L1 icache
-         */
-        b       20f
-        .balign L1_CACHE_BYTES
-22:
-        sync
-        mtspr   SPRN_L2CR,r3
-        sync
-        b       23f
-20:
-        b       21f
-21:     sync
-        isync
-        b       22b
-
-23:
-        /* Perform a global invalidation */
-        oris    r3,r3,0x0020
-        sync
-        mtspr   SPRN_L2CR,r3
-        sync
-        isync                           /* For errata */
-
-BEGIN_FTR_SECTION
-        /* On the 7450, we wait for the L2I bit to clear......
-        */
-10:     mfspr   r3,SPRN_L2CR
-        andis.  r4,r3,0x0020
-        bne     10b
-        b       11f
-END_FTR_SECTION_IFSET(CPU_FTR_SPEC7450)
-
-        /* Wait for the invalidation to complete */
-3:      mfspr   r3,SPRN_L2CR
-        rlwinm. r4,r3,0,31,31
-        bne     3b
-
-11:     rlwinm  r3,r3,0,11,9            /* Turn off the L2I bit */
-        sync
-        mtspr   SPRN_L2CR,r3
-        sync
-
-        /* See if we need to enable the cache */
-        cmplwi  r5,0
-        beq     4f
-
-        /* Enable the cache */
-        oris    r3,r3,0x8000
-        mtspr   SPRN_L2CR,r3
-        sync
-        
-        /* Enable L2 HW prefetch on 744x/745x */
-BEGIN_FTR_SECTION
-        mfspr   r3,SPRN_MSSCR0
-        ori     r3,r3,3
-        sync
-        mtspr   SPRN_MSSCR0,r3
-        sync
-        isync
-END_FTR_SECTION_IFSET(CPU_FTR_SPEC7450)
-4:
-
-        /* Restore HID0[DPM] to whatever it was before */
-        sync
-        mtspr   1008,r8
-        sync
-
-        /* Restore MSR (restores EE and DR bits to original state) */
-        SYNC
-        mtmsr   r7
-        isync
-
-        mtlr    r9
-        blr
-
-_GLOBAL(_get_L2CR)
-        /* Return the L2CR contents */
-        li      r3,0
-BEGIN_FTR_SECTION
-        mfspr   r3,SPRN_L2CR
-END_FTR_SECTION_IFSET(CPU_FTR_L2CR)
-        blr
-
-
-/*
- * Here is a similar routine for dealing with the L3 cache
- * on the 745x family of chips
- */
-
-_GLOBAL(_set_L3CR)
-        /* Make sure this is a 745x chip */
-BEGIN_FTR_SECTION
-        li      r3,-1
-        blr
-END_FTR_SECTION_IFCLR(CPU_FTR_L3CR)
-
-        /* Turn off interrupts and data relocation. */
-        mfmsr   r7              /* Save MSR in r7 */
-        rlwinm  r4,r7,0,17,15
-        rlwinm  r4,r4,0,28,26   /* Turn off DR bit */
-        sync
-        mtmsr   r4
-        isync
-
-        /* Stop DST streams */
-        DSSALL
-        sync
-
-        /* Get the current enable bit of the L3CR into r4 */
-        mfspr   r4,SPRN_L3CR
-
-        /* Tweak some bits */
-        rlwinm  r5,r3,0,0,0             /* r5 contains the new enable bit */
-        rlwinm  r3,r3,0,22,20           /* Turn off the invalidate bit */
-        rlwinm  r3,r3,0,2,31            /* Turn off the enable & PE bits */
-        rlwinm  r3,r3,0,5,3             /* Turn off the clken bit */
-        /* Check to see if we need to flush */
-        rlwinm. r4,r4,0,0,0
-        beq     2f
-
-        /* Flush the cache.
-         */
-
-        /* TODO: use HW flush assist */
-
-        lis     r4,0x0008
-        mtctr   r4
-        li      r4,0
-1:
-        lwzx    r0,r0,r4
-        dcbf    0,r4
-        addi    r4,r4,32                /* Go to start of next cache line */
-        bdnz    1b
-
-2:
-        /* Set up the L3CR configuration bits (and switch L3 off) */
-        sync
-        mtspr   SPRN_L3CR,r3
-        sync
-
-        oris    r3,r3,L3CR_L3RES@h              /* Set reserved bit 5 */
-        mtspr   SPRN_L3CR,r3
-        sync
-        oris    r3,r3,L3CR_L3CLKEN@h            /* Set clken */
-        mtspr   SPRN_L3CR,r3
-        sync
-
-        /* Wait for stabilize */
-        li      r0,256
-        mtctr   r0
-1:      bdnz    1b
-
-        /* Perform a global invalidation */
-        ori     r3,r3,0x0400
-        sync
-        mtspr   SPRN_L3CR,r3
-        sync
-        isync
-
-        /* We wait for the L3I bit to clear...... */
-10:     mfspr   r3,SPRN_L3CR
-        andi.   r4,r3,0x0400
-        bne     10b
-
-        /* Clear CLKEN */
-        rlwinm  r3,r3,0,5,3             /* Turn off the clken bit */
-        mtspr   SPRN_L3CR,r3
-        sync
-
-        /* Wait for stabilize */
-        li      r0,256
-        mtctr   r0
-1:      bdnz    1b
-
-        /* See if we need to enable the cache */
-        cmplwi  r5,0
-        beq     4f
-
-        /* Enable the cache */
-        oris    r3,r3,(L3CR_L3E | L3CR_L3CLKEN)@h
-        mtspr   SPRN_L3CR,r3
-        sync
-
-        /* Wait for stabilize */
-        li      r0,256
-        mtctr   r0
-1:      bdnz    1b
-
-        /* Restore MSR (restores EE and DR bits to original state) */
-4:      SYNC
-        mtmsr   r7
-        isync
-        blr
-
-_GLOBAL(_get_L3CR)
-        /* Return the L3CR contents */
-        li      r3,0
-BEGIN_FTR_SECTION
-        mfspr   r3,SPRN_L3CR
-END_FTR_SECTION_IFSET(CPU_FTR_L3CR)
-        blr
-
-/* --- End of PowerLogix code ---
- */
-
-
-/* flush_disable_L1()   - Flush and disable L1 cache
- *
- * clobbers r0, r3, ctr, cr0
- * Must be called with interrupts disabled and MMU enabled.
- */
-_GLOBAL(__flush_disable_L1)
-        /* Stop pending alitvec streams and memory accesses */
-BEGIN_FTR_SECTION
-        DSSALL
-END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
-        sync
-
-        /* Load counter to 0x4000 cache lines (512k) and
-         * load cache with datas
-         */
-        li      r3,0x4000       /* 512kB / 32B */
-        mtctr   r3
-        lis     r3,KERNELBASE@h
-1:
-        lwz     r0,0(r3)
-        addi    r3,r3,0x0020    /* Go to start of next cache line */
-        bdnz    1b
-        isync
-        sync
-
-        /* Now flush those cache lines */
-        li      r3,0x4000       /* 512kB / 32B */
-        mtctr   r3
-        lis     r3,KERNELBASE@h
-1:
-        dcbf    0,r3
-        addi    r3,r3,0x0020    /* Go to start of next cache line */
-        bdnz    1b
-        sync
-
-        /* We can now disable the L1 cache (HID0:DCE, HID0:ICE) */
-        mfspr   r3,SPRN_HID0
-        rlwinm  r3,r3,0,18,15
-        mtspr   SPRN_HID0,r3
-        sync
-        isync
-        blr
-
-/* inval_enable_L1      - Invalidate and enable L1 cache
- *
- * Assumes L1 is already disabled and MSR:EE is off
- *
- * clobbers r3
- */
-_GLOBAL(__inval_enable_L1)
-        /* Enable and then Flash inval the instruction & data cache */
-        mfspr   r3,SPRN_HID0
-        ori     r3,r3, HID0_ICE|HID0_ICFI|HID0_DCE|HID0_DCI
-        sync
-        isync
-        mtspr   SPRN_HID0,r3
-        xori    r3,r3, HID0_ICFI|HID0_DCI
-        mtspr   SPRN_HID0,r3
-        sync
-
-        blr
-
-
diff --git a/arch/ppc/kernel/module.c b/arch/ppc/kernel/module.c
deleted file mode 100644
index 92f4e5f64f02..000000000000
--- a/arch/ppc/kernel/module.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*  Kernel module help for PPC.
-    Copyright (C) 2001 Rusty Russell.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include <linux/module.h>
-#include <linux/moduleloader.h>
-#include <linux/elf.h>
-#include <linux/vmalloc.h>
-#include <linux/fs.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/cache.h>
-
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(fmt , ...)
-#endif
-
-LIST_HEAD(module_bug_list);
-
-void *module_alloc(unsigned long size)
-{
-        if (size == 0)
-                return NULL;
-        return vmalloc(size);
-}
-
-/* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
-{
-        vfree(module_region);
-        /* FIXME: If module_region == mod->init_region, trim exception
-           table entries. */
-}
-
-/* Count how many different relocations (different symbol, different
-   addend) */
-static unsigned int count_relocs(const Elf32_Rela *rela, unsigned int num)
-{
-        unsigned int i, j, ret = 0;
-
-        /* Sure, this is order(n^2), but it's usually short, and not
-           time critical */
-        for (i = 0; i < num; i++) {
-                for (j = 0; j < i; j++) {
-                        /* If this addend appeared before, it's
-                           already been counted */
-                        if (ELF32_R_SYM(rela[i].r_info)
-                            == ELF32_R_SYM(rela[j].r_info)
-                            && rela[i].r_addend == rela[j].r_addend)
-                                break;
-                }
-                if (j == i) ret++;
-        }
-        return ret;
-}
-
-/* Get the potential trampolines size required of the init and
-   non-init sections */
-static unsigned long get_plt_size(const Elf32_Ehdr *hdr,
-                                  const Elf32_Shdr *sechdrs,
-                                  const char *secstrings,
-                                  int is_init)
-{
-        unsigned long ret = 0;
-        unsigned i;
-
-        /* Everything marked ALLOC (this includes the exported
-           symbols) */
-        for (i = 1; i < hdr->e_shnum; i++) {
-                /* If it's called *.init*, and we're not init, we're
-                   not interested */
-                if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-                    != is_init)
-                        continue;
-
-                /* We don't want to look at debug sections. */
-                if (strstr(secstrings + sechdrs[i].sh_name, ".debug") != 0)
-                        continue;
-
-                if (sechdrs[i].sh_type == SHT_RELA) {
-                        DEBUGP("Found relocations in section %u\n", i);
-                        DEBUGP("Ptr: %p.  Number: %u\n",
-                               (void *)hdr + sechdrs[i].sh_offset,
-                               sechdrs[i].sh_size / sizeof(Elf32_Rela));
-                        ret += count_relocs((void *)hdr
-                                             + sechdrs[i].sh_offset,
-                                             sechdrs[i].sh_size
-                                             / sizeof(Elf32_Rela))
-                                * sizeof(struct ppc_plt_entry);
-                }
-        }
-
-        return ret;
-}
-
-int module_frob_arch_sections(Elf32_Ehdr *hdr,
-                              Elf32_Shdr *sechdrs,
-                              char *secstrings,
-                              struct module *me)
-{
-        unsigned int i;
-
-        /* Find .plt and .init.plt sections */
-        for (i = 0; i < hdr->e_shnum; i++) {
-                if (strcmp(secstrings + sechdrs[i].sh_name, ".init.plt") == 0)
-                        me->arch.init_plt_section = i;
-                else if (strcmp(secstrings + sechdrs[i].sh_name, ".plt") == 0)
-                        me->arch.core_plt_section = i;
-        }
-        if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
-                printk("Module doesn't contain .plt or .init.plt sections.\n");
-                return -ENOEXEC;
-        }
-
-        /* Override their sizes */
-        sechdrs[me->arch.core_plt_section].sh_size
-                = get_plt_size(hdr, sechdrs, secstrings, 0);
-        sechdrs[me->arch.init_plt_section].sh_size
-                = get_plt_size(hdr, sechdrs, secstrings, 1);
-        return 0;
-}
-
-int apply_relocate(Elf32_Shdr *sechdrs,
-                   const char *strtab,
-                   unsigned int symindex,
-                   unsigned int relsec,
-                   struct module *module)
-{
-        printk(KERN_ERR "%s: Non-ADD RELOCATION unsupported\n",
-               module->name);
-        return -ENOEXEC;
-}
-
-static inline int entry_matches(struct ppc_plt_entry *entry, Elf32_Addr val)
-{
-        if (entry->jump[0] == 0x3d600000 + ((val + 0x8000) >> 16)
-            && entry->jump[1] == 0x396b0000 + (val & 0xffff))
-                return 1;
-        return 0;
-}
-
-/* Set up a trampoline in the PLT to bounce us to the distant function */
-static uint32_t do_plt_call(void *location,
-                            Elf32_Addr val,
-                            Elf32_Shdr *sechdrs,
-                            struct module *mod)
-{
-        struct ppc_plt_entry *entry;
-
-        DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
-        /* Init, or core PLT? */
-        if (location >= mod->module_core
-            && location < mod->module_core + mod->core_size)
-                entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
-        else
-                entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
-
-        /* Find this entry, or if that fails, the next avail. entry */
-        while (entry->jump[0]) {
-                if (entry_matches(entry, val)) return (uint32_t)entry;
-                entry++;
-        }
-
-        /* Stolen from Paul Mackerras as well... */
-        entry->jump[0] = 0x3d600000+((val+0x8000)>>16); /* lis r11,sym@ha */
-        entry->jump[1] = 0x396b0000 + (val&0xffff);     /* addi r11,r11,sym@l*/
-        entry->jump[2] = 0x7d6903a6;                    /* mtctr r11 */
-        entry->jump[3] = 0x4e800420;                    /* bctr */
-
-        DEBUGP("Initialized plt for 0x%x at %p\n", val, entry);
-        return (uint32_t)entry;
-}
-
-int apply_relocate_add(Elf32_Shdr *sechdrs,
-                       const char *strtab,
-                       unsigned int symindex,
-                       unsigned int relsec,
-                       struct module *module)
-{
-        unsigned int i;
-        Elf32_Rela *rela = (void *)sechdrs[relsec].sh_addr;
-        Elf32_Sym *sym;
-        uint32_t *location;
-        uint32_t value;
-
-        DEBUGP("Applying ADD relocate section %u to %u\n", relsec,
-               sechdrs[relsec].sh_info);
-        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rela); i++) {
-                /* This is where to make the change */
-                location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
-                        + rela[i].r_offset;
-                /* This is the symbol it is referring to.  Note that all
-                   undefined symbols have been resolved.  */
-                sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-                        + ELF32_R_SYM(rela[i].r_info);
-                /* `Everything is relative'. */
-                value = sym->st_value + rela[i].r_addend;
-
-                switch (ELF32_R_TYPE(rela[i].r_info)) {
-                case R_PPC_ADDR32:
-                        /* Simply set it */
-                        *(uint32_t *)location = value;
-                        break;
-
-                case R_PPC_ADDR16_LO:
-                        /* Low half of the symbol */
-                        *(uint16_t *)location = value;
-                        break;
-                
-                case R_PPC_ADDR16_HA:
-                        /* Sign-adjusted lower 16 bits: PPC ELF ABI says:
-                           (((x >> 16) + ((x & 0x8000) ? 1 : 0))) & 0xFFFF.
-                           This is the same, only sane.
-                         */
-                        *(uint16_t *)location = (value + 0x8000) >> 16;
-                        break;
-
-                case R_PPC_REL24:
-                        if ((int)(value - (uint32_t)location) < -0x02000000
-                            || (int)(value - (uint32_t)location) >= 0x02000000)
-                                value = do_plt_call(location, value,
-                                                    sechdrs, module);
-
-                        /* Only replace bits 2 through 26 */
-                        DEBUGP("REL24 value = %08X. location = %08X\n",
-                               value, (uint32_t)location);
-                        DEBUGP("Location before: %08X.\n",
-                               *(uint32_t *)location);
-                        *(uint32_t *)location
-                                = (*(uint32_t *)location & ~0x03fffffc)
-                                | ((value - (uint32_t)location)
-                                   & 0x03fffffc);
-                        DEBUGP("Location after: %08X.\n",
-                               *(uint32_t *)location);
-                        DEBUGP("ie. jump to %08X+%08X = %08X\n",
-                               *(uint32_t *)location & 0x03fffffc,
-                               (uint32_t)location,
-                               (*(uint32_t *)location & 0x03fffffc)
-                               + (uint32_t)location);
-                        break;
-
-                case R_PPC_REL32:
-                        /* 32-bit relative jump. */
-                        *(uint32_t *)location = value - (uint32_t)location;
-                        break;
-
-                default:
-                        printk("%s: unknown ADD relocation: %u\n",
-                               module->name,
-                               ELF32_R_TYPE(rela[i].r_info));
-                        return -ENOEXEC;
-                }
-        }
-        return 0;
-}
-
-int module_finalize(const Elf_Ehdr *hdr,
-                    const Elf_Shdr *sechdrs,
-                    struct module *me)
-{
-        char *secstrings;
-        unsigned int i;
-
-        me->arch.bug_table = NULL;
-        me->arch.num_bugs = 0;
-
-        /* Find the __bug_table section, if present */
-        secstrings = (char *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
-        for (i = 1; i < hdr->e_shnum; i++) {
-                if (strcmp(secstrings+sechdrs[i].sh_name, "__bug_table"))
-                        continue;
-                me->arch.bug_table = (void *) sechdrs[i].sh_addr;
-                me->arch.num_bugs = sechdrs[i].sh_size / sizeof(struct bug_entry);
-                break;
-        }
-
-        /*
-         * Strictly speaking this should have a spinlock to protect against
-         * traversals, but since we only traverse on BUG()s, a spinlock
-         * could potentially lead to deadlock and thus be counter-productive.
-         */
-        list_add(&me->arch.bug_list, &module_bug_list);
-
-        return 0;
-}
-
-void module_arch_cleanup(struct module *mod)
-{
-        list_del(&mod->arch.bug_list);
-}
-
-struct bug_entry *module_find_bug(unsigned long bugaddr)
-{
-        struct mod_arch_specific *mod;
-        unsigned int i;
-        struct bug_entry *bug;
-
-        list_for_each_entry(mod, &module_bug_list, bug_list) {
-                bug = mod->bug_table;
-                for (i = 0; i < mod->num_bugs; ++i, ++bug)
-                        if (bugaddr == bug->bug_addr)
-                                return bug;
-        }
-        return NULL;
-}
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 04d04c5bfdd0..809673a36f7a 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -46,9 +46,6 @@ static void pcibios_fixup_resources(struct pci_dev* dev);
 static void fixup_broken_pcnet32(struct pci_dev* dev);
 static int reparent_resources(struct resource *parent, struct resource *res);
 static void fixup_cpc710_pci64(struct pci_dev* dev);
-#ifdef CONFIG_PPC_OF
-static u8* pci_to_OF_bus_map;
-#endif
 
 /* By default, we don't re-assign bus numbers.
  */
@@ -625,406 +622,13 @@ pcibios_alloc_controller(void)
         return hose;
 }
 
-#ifdef CONFIG_PPC_OF
-/*
- * Functions below are used on OpenFirmware machines.
- */
-static void
-make_one_node_map(struct device_node* node, u8 pci_bus)
-{
-        int *bus_range;
-        int len;
-
-        if (pci_bus >= pci_bus_count)
-                return;
-        bus_range = (int *) get_property(node, "bus-range", &len);
-        if (bus_range == NULL || len < 2 * sizeof(int)) {
-                printk(KERN_WARNING "Can't get bus-range for %s, "
-                       "assuming it starts at 0\n", node->full_name);
-                pci_to_OF_bus_map[pci_bus] = 0;
-        } else
-                pci_to_OF_bus_map[pci_bus] = bus_range[0];
-
-        for (node=node->child; node != 0;node = node->sibling) {
-                struct pci_dev* dev;
-                unsigned int *class_code, *reg;
-        
-                class_code = (unsigned int *) get_property(node, "class-code", NULL);
-                if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI &&
-                        (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS))
-                        continue;
-                reg = (unsigned int *)get_property(node, "reg", NULL);
-                if (!reg)
-                        continue;
-                dev = pci_find_slot(pci_bus, ((reg[0] >> 8) & 0xff));
-                if (!dev || !dev->subordinate)
-                        continue;
-                make_one_node_map(node, dev->subordinate->number);
-        }
-}
-        
-void
-pcibios_make_OF_bus_map(void)
-{
-        int i;
-        struct pci_controller* hose;
-        u8* of_prop_map;
-
-        pci_to_OF_bus_map = (u8*)kmalloc(pci_bus_count, GFP_KERNEL);
-        if (!pci_to_OF_bus_map) {
-                printk(KERN_ERR "Can't allocate OF bus map !\n");
-                return;
-        }
-
-        /* We fill the bus map with invalid values, that helps
-         * debugging.
-         */
-        for (i=0; i<pci_bus_count; i++)
-                pci_to_OF_bus_map[i] = 0xff;
-
-        /* For each hose, we begin searching bridges */
-        for(hose=hose_head; hose; hose=hose->next) {
-                struct device_node* node;       
-                node = (struct device_node *)hose->arch_data;
-                if (!node)
-                        continue;
-                make_one_node_map(node, hose->first_busno);
-        }
-        of_prop_map = get_property(find_path_device("/"), "pci-OF-bus-map", NULL);
-        if (of_prop_map)
-                memcpy(of_prop_map, pci_to_OF_bus_map, pci_bus_count);
-#ifdef DEBUG
-        printk("PCI->OF bus map:\n");
-        for (i=0; i<pci_bus_count; i++) {
-                if (pci_to_OF_bus_map[i] == 0xff)
-                        continue;
-                printk("%d -> %d\n", i, pci_to_OF_bus_map[i]);
-        }
-#endif
-}
-
-typedef int (*pci_OF_scan_iterator)(struct device_node* node, void* data);
-
-static struct device_node*
-scan_OF_pci_childs(struct device_node* node, pci_OF_scan_iterator filter, void* data)
-{
-        struct device_node* sub_node;
-
-        for (; node != 0;node = node->sibling) {
-                unsigned int *class_code;
-        
-                if (filter(node, data))
-                        return node;
-
-                /* For PCI<->PCI bridges or CardBus bridges, we go down
-                 * Note: some OFs create a parent node "multifunc-device" as
-                 * a fake root for all functions of a multi-function device,
-                 * we go down them as well.
-                 */
-                class_code = (unsigned int *) get_property(node, "class-code", NULL);
-                if ((!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI &&
-                        (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) &&
-                        strcmp(node->name, "multifunc-device"))
-                        continue;
-                sub_node = scan_OF_pci_childs(node->child, filter, data);
-                if (sub_node)
-                        return sub_node;
-        }
-        return NULL;
-}
-
-static int
-scan_OF_pci_childs_iterator(struct device_node* node, void* data)
-{
-        unsigned int *reg;
-        u8* fdata = (u8*)data;
-        
-        reg = (unsigned int *) get_property(node, "reg", NULL);
-        if (reg && ((reg[0] >> 8) & 0xff) == fdata[1]
-                && ((reg[0] >> 16) & 0xff) == fdata[0])
-                return 1;
-        return 0;
-}
-
-static struct device_node*
-scan_OF_childs_for_device(struct device_node* node, u8 bus, u8 dev_fn)
-{
-        u8 filter_data[2] = {bus, dev_fn};
-
-        return scan_OF_pci_childs(node, scan_OF_pci_childs_iterator, filter_data);
-}
-
-/*
- * Scans the OF tree for a device node matching a PCI device
- */
-struct device_node *
-pci_busdev_to_OF_node(struct pci_bus *bus, int devfn)
-{
-        struct pci_controller *hose;
-        struct device_node *node;
-        int busnr;
-
-        if (!have_of)
-                return NULL;
-        
-        /* Lookup the hose */
-        busnr = bus->number;
-        hose = pci_bus_to_hose(busnr);
-        if (!hose)
-                return NULL;
-
-        /* Check it has an OF node associated */
-        node = (struct device_node *) hose->arch_data;
-        if (!node)
-                return NULL;
-
-        /* Fixup bus number according to what OF think it is. */
-        if (pci_to_OF_bus_map)
-                busnr = pci_to_OF_bus_map[busnr];
-        if (busnr == 0xff)
-                return NULL;
-        
-        /* Now, lookup childs of the hose */
-        return scan_OF_childs_for_device(node->child, busnr, devfn);
-}
-EXPORT_SYMBOL(pci_busdev_to_OF_node);
-
-struct device_node*
-pci_device_to_OF_node(struct pci_dev *dev)
-{
-        return pci_busdev_to_OF_node(dev->bus, dev->devfn);
-}
-EXPORT_SYMBOL(pci_device_to_OF_node);
-
-/* This routine is meant to be used early during boot, when the
- * PCI bus numbers have not yet been assigned, and you need to
- * issue PCI config cycles to an OF device.
- * It could also be used to "fix" RTAS config cycles if you want
- * to set pci_assign_all_buses to 1 and still use RTAS for PCI
- * config cycles.
- */
-struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
-{
-        if (!have_of)
-                return NULL;
-        while(node) {
-                struct pci_controller* hose;
-                for (hose=hose_head;hose;hose=hose->next)
-                        if (hose->arch_data == node)
-                                return hose;
-                node=node->parent;
-        }
-        return NULL;
-}
-
-static int
-find_OF_pci_device_filter(struct device_node* node, void* data)
-{
-        return ((void *)node == data);
-}
-
-/*
- * Returns the PCI device matching a given OF node
- */
-int
-pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn)
-{
-        unsigned int *reg;
-        struct pci_controller* hose;
-        struct pci_dev* dev = NULL;
-        
-        if (!have_of)
-                return -ENODEV;
-        /* Make sure it's really a PCI device */
-        hose = pci_find_hose_for_OF_device(node);
-        if (!hose || !hose->arch_data)
-                return -ENODEV;
-        if (!scan_OF_pci_childs(((struct device_node*)hose->arch_data)->child,
-                        find_OF_pci_device_filter, (void *)node))
-                return -ENODEV;
-        reg = (unsigned int *) get_property(node, "reg", NULL);
-        if (!reg)
-                return -ENODEV;
-        *bus = (reg[0] >> 16) & 0xff;
-        *devfn = ((reg[0] >> 8) & 0xff);
-
-        /* Ok, here we need some tweak. If we have already renumbered
-         * all busses, we can't rely on the OF bus number any more.
-         * the pci_to_OF_bus_map is not enough as several PCI busses
-         * may match the same OF bus number.
-         */
-        if (!pci_to_OF_bus_map)
-                return 0;
-
-        for_each_pci_dev(dev)
-                if (pci_to_OF_bus_map[dev->bus->number] == *bus &&
-                                dev->devfn == *devfn) {
-                        *bus = dev->bus->number;
-                        pci_dev_put(dev);
-                        return 0;
-                }
-
-        return -ENODEV;
-}
-EXPORT_SYMBOL(pci_device_from_OF_node);
-
-void __init
-pci_process_bridge_OF_ranges(struct pci_controller *hose,
-                           struct device_node *dev, int primary)
-{
-        static unsigned int static_lc_ranges[256] __initdata;
-        unsigned int *dt_ranges, *lc_ranges, *ranges, *prev;
-        unsigned int size;
-        int rlen = 0, orig_rlen;
-        int memno = 0;
-        struct resource *res;
-        int np, na = prom_n_addr_cells(dev);
-        np = na + 5;
-
-        /* First we try to merge ranges to fix a problem with some pmacs
-         * that can have more than 3 ranges, fortunately using contiguous
-         * addresses -- BenH
-         */
-        dt_ranges = (unsigned int *) get_property(dev, "ranges", &rlen);
-        if (!dt_ranges)
-                return;
-        /* Sanity check, though hopefully that never happens */
-        if (rlen > sizeof(static_lc_ranges)) {
-                printk(KERN_WARNING "OF ranges property too large !\n");
-                rlen = sizeof(static_lc_ranges);
-        }
-        lc_ranges = static_lc_ranges;
-        memcpy(lc_ranges, dt_ranges, rlen);
-        orig_rlen = rlen;
-
-        /* Let's work on a copy of the "ranges" property instead of damaging
-         * the device-tree image in memory
-         */
-        ranges = lc_ranges;
-        prev = NULL;
-        while ((rlen -= np * sizeof(unsigned int)) >= 0) {
-                if (prev) {
-                        if (prev[0] == ranges[0] && prev[1] == ranges[1] &&
-                                (prev[2] + prev[na+4]) == ranges[2] &&
-                                (prev[na+2] + prev[na+4]) == ranges[na+2]) {
-                                prev[na+4] += ranges[na+4];
-                                ranges[0] = 0;
-                                ranges += np;
-                                continue;
-                        }
-                }
-                prev = ranges;
-                ranges += np;
-        }
-
-        /*
-         * The ranges property is laid out as an array of elements,
-         * each of which comprises:
-         *   cells 0 - 2:       a PCI address
-         *   cells 3 or 3+4:    a CPU physical address
-         *                      (size depending on dev->n_addr_cells)
-         *   cells 4+5 or 5+6:  the size of the range
-         */
-        ranges = lc_ranges;
-        rlen = orig_rlen;
-        while (ranges && (rlen -= np * sizeof(unsigned int)) >= 0) {
-                res = NULL;
-                size = ranges[na+4];
-                switch ((ranges[0] >> 24) & 0x3) {
-                case 1:         /* I/O space */
-                        if (ranges[2] != 0)
-                                break;
-                        hose->io_base_phys = ranges[na+2];
-                        /* limit I/O space to 16MB */
-                        if (size > 0x01000000)
-                                size = 0x01000000;
-                        hose->io_base_virt = ioremap(ranges[na+2], size);
-                        if (primary)
-                                isa_io_base = (unsigned long) hose->io_base_virt;
-                        res = &hose->io_resource;
-                        res->flags = IORESOURCE_IO;
-                        res->start = ranges[2];
-                        DBG("PCI: IO 0x%lx -> 0x%lx\n",
-                                    res->start, res->start + size - 1);
-                        break;
-                case 2:         /* memory space */
-                        memno = 0;
-                        if (ranges[1] == 0 && ranges[2] == 0
-                            && ranges[na+4] <= (16 << 20)) {
-                                /* 1st 16MB, i.e. ISA memory area */
-                                if (primary)
-                                        isa_mem_base = ranges[na+2];
-                                memno = 1;
-                        }
-                        while (memno < 3 && hose->mem_resources[memno].flags)
-                                ++memno;
-                        if (memno == 0)
-                                hose->pci_mem_offset = ranges[na+2] - ranges[2];
-                        if (memno < 3) {
-                                res = &hose->mem_resources[memno];
-                                res->flags = IORESOURCE_MEM;
-                                if(ranges[0] & 0x40000000)
-                                        res->flags |= IORESOURCE_PREFETCH;
-                                res->start = ranges[na+2];
-                                DBG("PCI: MEM[%d] 0x%lx -> 0x%lx\n", memno,
-                                            res->start, res->start + size - 1);
-                        }
-                        break;
-                }
-                if (res != NULL) {
-                        res->name = dev->full_name;
-                        res->end = res->start + size - 1;
-                        res->parent = NULL;
-                        res->sibling = NULL;
-                        res->child = NULL;
-                }
-                ranges += np;
-        }
-}
-
-/* We create the "pci-OF-bus-map" property now so it appears in the
- * /proc device tree
- */
-void __init
-pci_create_OF_bus_map(void)
-{
-        struct property* of_prop;
-        
-        of_prop = (struct property*) alloc_bootmem(sizeof(struct property) + 256);
-        if (of_prop && find_path_device("/")) {
-                memset(of_prop, -1, sizeof(struct property) + 256);
-                of_prop->name = "pci-OF-bus-map";
-                of_prop->length = 256;
-                of_prop->value = (unsigned char *)&of_prop[1];
-                prom_add_property(find_path_device("/"), of_prop);
-        }
-}
-
-static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct pci_dev *pdev;
-        struct device_node *np;
-
-        pdev = to_pci_dev (dev);
-        np = pci_device_to_OF_node(pdev);
-        if (np == NULL || np->full_name == NULL)
-                return 0;
-        return sprintf(buf, "%s", np->full_name);
-}
-static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL);
-
-#else /* CONFIG_PPC_OF */
 void pcibios_make_OF_bus_map(void)
 {
 }
-#endif /* CONFIG_PPC_OF */
 
 /* Add sysfs properties */
 void pcibios_add_platform_entries(struct pci_dev *pdev)
 {
-#ifdef CONFIG_PPC_OF
-        device_create_file(&pdev->dev, &dev_attr_devspec);
-#endif /* CONFIG_PPC_OF */
 }
 
 
diff --git a/arch/ppc/kernel/perfmon_fsl_booke.c b/arch/ppc/kernel/perfmon_fsl_booke.c
deleted file mode 100644
index 32455dfcc36b..000000000000
--- a/arch/ppc/kernel/perfmon_fsl_booke.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* kernel/perfmon_fsl_booke.c
- * Freescale Book-E Performance Monitor code
- *
- * Author: Andy Fleming
- * Copyright (c) 2004 Freescale Semiconductor, Inc
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
- */
-
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/stddef.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/interrupt.h>
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/prctl.h>
-
-#include <asm/pgtable.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/reg.h>
-#include <asm/xmon.h>
-#include <asm/pmc.h>
-
-static inline u32 get_pmlca(int ctr);
-static inline void set_pmlca(int ctr, u32 pmlca);
-
-static inline u32 get_pmlca(int ctr)
-{
-        u32 pmlca;
-
-        switch (ctr) {
-                case 0:
-                        pmlca = mfpmr(PMRN_PMLCA0);
-                        break;
-                case 1:
-                        pmlca = mfpmr(PMRN_PMLCA1);
-                        break;
-                case 2:
-                        pmlca = mfpmr(PMRN_PMLCA2);
-                        break;
-                case 3:
-                        pmlca = mfpmr(PMRN_PMLCA3);
-                        break;
-                default:
-                        panic("Bad ctr number\n");
-        }
-
-        return pmlca;
-}
-
-static inline void set_pmlca(int ctr, u32 pmlca)
-{
-        switch (ctr) {
-                case 0:
-                        mtpmr(PMRN_PMLCA0, pmlca);
-                        break;
-                case 1:
-                        mtpmr(PMRN_PMLCA1, pmlca);
-                        break;
-                case 2:
-                        mtpmr(PMRN_PMLCA2, pmlca);
-                        break;
-                case 3:
-                        mtpmr(PMRN_PMLCA3, pmlca);
-                        break;
-                default:
-                        panic("Bad ctr number\n");
-        }
-}
-
-void init_pmc_stop(int ctr)
-{
-        u32 pmlca = (PMLCA_FC | PMLCA_FCS | PMLCA_FCU |
-                        PMLCA_FCM1 | PMLCA_FCM0);
-        u32 pmlcb = 0;
-
-        switch (ctr) {
-                case 0:
-                        mtpmr(PMRN_PMLCA0, pmlca);
-                        mtpmr(PMRN_PMLCB0, pmlcb);
-                        break;
-                case 1:
-                        mtpmr(PMRN_PMLCA1, pmlca);
-                        mtpmr(PMRN_PMLCB1, pmlcb);
-                        break;
-                case 2:
-                        mtpmr(PMRN_PMLCA2, pmlca);
-                        mtpmr(PMRN_PMLCB2, pmlcb);
-                        break;
-                case 3:
-                        mtpmr(PMRN_PMLCA3, pmlca);
-                        mtpmr(PMRN_PMLCB3, pmlcb);
-                        break;
-                default:
-                        panic("Bad ctr number!\n");
-        }
-}
-
-void set_pmc_event(int ctr, int event)
-{
-        u32 pmlca;
-
-        pmlca = get_pmlca(ctr);
-
-        pmlca = (pmlca & ~PMLCA_EVENT_MASK) |
-                ((event << PMLCA_EVENT_SHIFT) &
-                 PMLCA_EVENT_MASK);
-
-        set_pmlca(ctr, pmlca);
-}
-
-void set_pmc_user_kernel(int ctr, int user, int kernel)
-{
-        u32 pmlca;
-
-        pmlca = get_pmlca(ctr);
-
-        if(user)
-                pmlca &= ~PMLCA_FCU;
-        else
-                pmlca |= PMLCA_FCU;
-
-        if(kernel)
-                pmlca &= ~PMLCA_FCS;
-        else
-                pmlca |= PMLCA_FCS;
-
-        set_pmlca(ctr, pmlca);
-}
-
-void set_pmc_marked(int ctr, int mark0, int mark1)
-{
-        u32 pmlca = get_pmlca(ctr);
-
-        if(mark0)
-                pmlca &= ~PMLCA_FCM0;
-        else
-                pmlca |= PMLCA_FCM0;
-
-        if(mark1)
-                pmlca &= ~PMLCA_FCM1;
-        else
-                pmlca |= PMLCA_FCM1;
-
-        set_pmlca(ctr, pmlca);
-}
-
-void pmc_start_ctr(int ctr, int enable)
-{
-        u32 pmlca = get_pmlca(ctr);
-
-        pmlca &= ~PMLCA_FC;
-
-        if (enable)
-                pmlca |= PMLCA_CE;
-        else
-                pmlca &= ~PMLCA_CE;
-
-        set_pmlca(ctr, pmlca);
-}
-
-void pmc_start_ctrs(int enable)
-{
-        u32 pmgc0 = mfpmr(PMRN_PMGC0);
-
-        pmgc0 &= ~PMGC0_FAC;
-        pmgc0 |= PMGC0_FCECE;
-
-        if (enable)
-                pmgc0 |= PMGC0_PMIE;
-        else
-                pmgc0 &= ~PMGC0_PMIE;
-
-        mtpmr(PMRN_PMGC0, pmgc0);
-}
-
-void pmc_stop_ctrs(void)
-{
-        u32 pmgc0 = mfpmr(PMRN_PMGC0);
-
-        pmgc0 |= PMGC0_FAC;
-
-        pmgc0 &= ~(PMGC0_PMIE | PMGC0_FCECE);
-
-        mtpmr(PMRN_PMGC0, pmgc0);
-}
-
-void dump_pmcs(void)
-{
-        printk("pmgc0: %x\n", mfpmr(PMRN_PMGC0));
-        printk("pmc\t\tpmlca\t\tpmlcb\n");
-        printk("%8x\t%8x\t%8x\n", mfpmr(PMRN_PMC0),
-                        mfpmr(PMRN_PMLCA0), mfpmr(PMRN_PMLCB0));
-        printk("%8x\t%8x\t%8x\n", mfpmr(PMRN_PMC1),
-                        mfpmr(PMRN_PMLCA1), mfpmr(PMRN_PMLCB1));
-        printk("%8x\t%8x\t%8x\n", mfpmr(PMRN_PMC2),
-                        mfpmr(PMRN_PMLCA2), mfpmr(PMRN_PMLCB2));
-        printk("%8x\t%8x\t%8x\n", mfpmr(PMRN_PMC3),
-                        mfpmr(PMRN_PMLCA3), mfpmr(PMRN_PMLCB3));
-}
-
-EXPORT_SYMBOL(init_pmc_stop);
-EXPORT_SYMBOL(set_pmc_event);
-EXPORT_SYMBOL(set_pmc_user_kernel);
-EXPORT_SYMBOL(set_pmc_marked);
-EXPORT_SYMBOL(pmc_start_ctr);
-EXPORT_SYMBOL(pmc_start_ctrs);
-EXPORT_SYMBOL(pmc_stop_ctrs);
-EXPORT_SYMBOL(dump_pmcs);
diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c
index 2f5c7650274f..75c645043746 100644
--- a/arch/ppc/kernel/ppc_htab.c
+++ b/arch/ppc/kernel/ppc_htab.c
@@ -52,7 +52,7 @@ static int ppc_htab_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_htab_show, NULL);
 }
 
-struct file_operations ppc_htab_operations = {
+const struct file_operations ppc_htab_operations = {
         .open           = ppc_htab_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -104,7 +104,7 @@ static char *pmc2_lookup(unsigned long mmcr0)
 static int ppc_htab_show(struct seq_file *m, void *v)
 {
         unsigned long mmcr0 = 0, pmc1 = 0, pmc2 = 0;
-#if defined(CONFIG_PPC_STD_MMU) && !defined(CONFIG_PPC64BRIDGE)
+#if defined(CONFIG_PPC_STD_MMU)
         unsigned int kptes = 0, uptes = 0;
         PTE *ptr;
 #endif /* CONFIG_PPC_STD_MMU */
@@ -133,7 +133,6 @@ static int ppc_htab_show(struct seq_file *m, void *v)
                 return 0;
         }
 
-#ifndef CONFIG_PPC64BRIDGE
         for (ptr = Hash; ptr < Hash_end; ptr++) {
                 unsigned int mctx, vsid;
 
@@ -147,7 +146,6 @@ static int ppc_htab_show(struct seq_file *m, void *v)
                 else
                         uptes++;
         }
-#endif
 
         seq_printf(m,
                       "PTE Hash Table Information\n"
@@ -155,20 +153,16 @@ static int ppc_htab_show(struct seq_file *m, void *v)
                       "Buckets\t\t: %lu\n"
                       "Address\t\t: %08lx\n"
                       "Entries\t\t: %lu\n"
-#ifndef CONFIG_PPC64BRIDGE
                       "User ptes\t: %u\n"
                       "Kernel ptes\t: %u\n"
                       "Percent full\t: %lu%%\n"
-#endif
                       , (unsigned long)(Hash_size>>10),
                       (Hash_size/(sizeof(PTE)*8)),
                       (unsigned long)Hash,
                       Hash_size/sizeof(PTE)
-#ifndef CONFIG_PPC64BRIDGE
                       , uptes,
                       kptes,
                       ((kptes+uptes)*100) / (Hash_size/sizeof(PTE))
-#endif
                 );
 
         seq_printf(m,
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 82adb4601348..865ba74991a9 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -18,7 +18,6 @@
 #include <linux/bitops.h>
 
 #include <asm/page.h>
-#include <asm/semaphore.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -30,7 +29,6 @@
 #include <linux/adb.h>
 #include <linux/cuda.h>
 #include <linux/pmu.h>
-#include <asm/prom.h>
 #include <asm/system.h>
 #include <asm/pci-bridge.h>
 #include <asm/irq.h>
@@ -208,27 +206,6 @@ EXPORT_SYMBOL(adb_try_handler_change);
 EXPORT_SYMBOL(cuda_request);
 EXPORT_SYMBOL(cuda_poll);
 #endif /* CONFIG_ADB_CUDA */
-#ifdef CONFIG_PPC_OF
-EXPORT_SYMBOL(find_devices);
-EXPORT_SYMBOL(find_type_devices);
-EXPORT_SYMBOL(find_compatible_devices);
-EXPORT_SYMBOL(find_path_device);
-EXPORT_SYMBOL(device_is_compatible);
-EXPORT_SYMBOL(machine_is_compatible);
-EXPORT_SYMBOL(find_all_nodes);
-EXPORT_SYMBOL(get_property);
-EXPORT_SYMBOL(request_OF_resource);
-EXPORT_SYMBOL(release_OF_resource);
-EXPORT_SYMBOL(of_find_node_by_name);
-EXPORT_SYMBOL(of_find_node_by_type);
-EXPORT_SYMBOL(of_find_compatible_node);
-EXPORT_SYMBOL(of_find_node_by_path);
-EXPORT_SYMBOL(of_find_all_nodes);
-EXPORT_SYMBOL(of_get_parent);
-EXPORT_SYMBOL(of_get_next_child);
-EXPORT_SYMBOL(of_node_get);
-EXPORT_SYMBOL(of_node_put);
-#endif /* CONFIG_PPC_OF */
 #if defined(CONFIG_BOOTX_TEXT)
 EXPORT_SYMBOL(btext_update_display);
 #endif
@@ -262,9 +239,6 @@ EXPORT_SYMBOL(console_drivers);
 EXPORT_SYMBOL(xmon);
 EXPORT_SYMBOL(xmon_printf);
 #endif
-EXPORT_SYMBOL(__up);
-EXPORT_SYMBOL(__down);
-EXPORT_SYMBOL(__down_interruptible);
 
 #if defined(CONFIG_KGDB) || defined(CONFIG_XMON)
 extern void (*debugger)(struct pt_regs *regs);
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index c08ab432e958..1f79e84ab464 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -1,5 +1,5 @@
 /*
- * Common prep/chrp boot and setup code.
+ * Common prep boot and setup code.
  */
 
 #include <linux/config.h>
@@ -72,17 +72,12 @@ unsigned long ISA_DMA_THRESHOLD;
 unsigned int DMA_MODE_READ;
 unsigned int DMA_MODE_WRITE;
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-int _machine = 0;
-EXPORT_SYMBOL(_machine);
-
+#ifdef CONFIG_PPC_PREP
 extern void prep_init(unsigned long r3, unsigned long r4,
                 unsigned long r5, unsigned long r6, unsigned long r7);
-extern void chrp_init(unsigned long r3, unsigned long r4,
-                unsigned long r5, unsigned long r6, unsigned long r7);
 
 dev_t boot_dev;
-#endif /* CONFIG_PPC_MULTIPLATFORM */
+#endif /* CONFIG_PPC_PREP */
 
 int have_of;
 EXPORT_SYMBOL(have_of);
@@ -168,9 +163,8 @@ int show_cpuinfo(struct seq_file *m, void *v)
                 /* Show summary information */
 #ifdef CONFIG_SMP
                 unsigned long bogosum = 0;
-                for (i = 0; i < NR_CPUS; ++i)
-                        if (cpu_online(i))
-                                bogosum += cpu_data[i].loops_per_jiffy;
+                for_each_online_cpu(i)
+                        bogosum += cpu_data[i].loops_per_jiffy;
                 seq_printf(m, "total bogomips\t: %lu.%02lu\n",
                            bogosum/(500000/HZ), bogosum/(5000/HZ) % 100);
 #endif /* CONFIG_SMP */
@@ -320,72 +314,12 @@ early_init(int r3, int r4, int r5)
         identify_cpu(offset, 0);
         do_cpu_ftr_fixups(offset);
 
-#if defined(CONFIG_PPC_OF)
-        reloc_got2(offset);
-
-        /*
-         * don't do anything on prep
-         * for now, don't use bootinfo because it breaks yaboot 0.5
-         * and assume that if we didn't find a magic number, we have OF
-         */
-        if (*(unsigned long *)(0) != 0xdeadc0de)
-                phys = prom_init(r3, r4, (prom_entry)r5);
-
-        reloc_got2(-offset);
-#endif
-
         return phys;
 }
 
-#ifdef CONFIG_PPC_OF
-/*
- * Assume here that all clock rates are the same in a
- * smp system.  -- Cort
- */
-int
-of_show_percpuinfo(struct seq_file *m, int i)
-{
-        struct device_node *cpu_node;
-        u32 *fp;
-        int s;
-        
-        cpu_node = find_type_devices("cpu");
-        if (!cpu_node)
-                return 0;
-        for (s = 0; s < i && cpu_node->next; s++)
-                cpu_node = cpu_node->next;
-        fp = (u32 *)get_property(cpu_node, "clock-frequency", NULL);
-        if (fp)
-                seq_printf(m, "clock\t\t: %dMHz\n", *fp / 1000000);
-        return 0;
-}
-
-void __init
-intuit_machine_type(void)
-{
-        char *model;
-        struct device_node *root;
-        
-        /* ask the OF info if we're a chrp or pmac */
-        root = find_path_device("/");
-        if (root != 0) {
-                /* assume pmac unless proven to be chrp -- Cort */
-                _machine = _MACH_Pmac;
-                model = get_property(root, "device_type", NULL);
-                if (model && !strncmp("chrp", model, 4))
-                        _machine = _MACH_chrp;
-                else {
-                        model = get_property(root, "model", NULL);
-                        if (model && !strncmp(model, "IBM", 3))
-                                _machine = _MACH_chrp;
-                }
-        }
-}
-#endif
-
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_PREP
 /*
- * The PPC_MULTIPLATFORM version of platform_init...
+ * The PPC_PREP version of platform_init...
  */
 void __init
 platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
@@ -400,161 +334,9 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 
         parse_bootinfo(find_bootinfo());
 
-        /* if we didn't get any bootinfo telling us what we are... */
-        if (_machine == 0) {
-                /* prep boot loader tells us if we're prep or not */
-                if ( *(unsigned long *)(KERNELBASE) == (0xdeadc0de) )
-                        _machine = _MACH_prep;
-        }
-
-#ifdef CONFIG_PPC_PREP
-        /* not much more to do here, if prep */
-        if (_machine == _MACH_prep) {
-                prep_init(r3, r4, r5, r6, r7);
-                return;
-        }
-#endif
-
-#ifdef CONFIG_PPC_OF
-        have_of = 1;
-
-        /* prom_init has already been called from __start */
-        if (boot_infos)
-                relocate_nodes();
-
-        /* If we aren't PReP, we can find out if we're Pmac
-         * or CHRP with this. */
-        if (_machine == 0)
-                intuit_machine_type();
-
-        /* finish_device_tree may need _machine defined. */
-        finish_device_tree();
-
-        /*
-         * If we were booted via quik, r3 points to the physical
-         * address of the command-line parameters.
-         * If we were booted from an xcoff image (i.e. netbooted or
-         * booted from floppy), we get the command line from the
-         * bootargs property of the /chosen node.
-         * If an initial ramdisk is present, r3 and r4
-         * are used for initrd_start and initrd_size,
-         * otherwise they contain 0xdeadbeef.
-         */
-        if (r3 >= 0x4000 && r3 < 0x800000 && r4 == 0) {
-                strlcpy(cmd_line, (char *)r3 + KERNELBASE,
-                        sizeof(cmd_line));
-        } else if (boot_infos != 0) {
-                /* booted by BootX - check for ramdisk */
-                if (boot_infos->kernelParamsOffset != 0)
-                        strlcpy(cmd_line, (char *) boot_infos
-                                + boot_infos->kernelParamsOffset,
-                                sizeof(cmd_line));
-#ifdef CONFIG_BLK_DEV_INITRD
-                if (boot_infos->ramDisk) {
-                        initrd_start = (unsigned long) boot_infos
-                                + boot_infos->ramDisk;
-                        initrd_end = initrd_start + boot_infos->ramDiskSize;
-                        initrd_below_start_ok = 1;
-                }
-#endif
-        } else {
-                struct device_node *chosen;
-                char *p;
-        
-#ifdef CONFIG_BLK_DEV_INITRD
-                if (r3 && r4 && r4 != 0xdeadbeef) {
-                        if (r3 < KERNELBASE)
-                                r3 += KERNELBASE;
-                        initrd_start = r3;
-                        initrd_end = r3 + r4;
-                        ROOT_DEV = Root_RAM0;
-                        initrd_below_start_ok = 1;
-                }
-#endif
-                chosen = find_devices("chosen");
-                if (chosen != NULL) {
-                        p = get_property(chosen, "bootargs", NULL);
-                        if (p && *p) {
-                                strlcpy(cmd_line, p, sizeof(cmd_line));
-                        }
-                }
-        }
-#ifdef CONFIG_ADB
-        if (strstr(cmd_line, "adb_sync")) {
-                extern int __adb_probe_sync;
-                __adb_probe_sync = 1;
-        }
-#endif /* CONFIG_ADB */
-
-        switch (_machine) {
-#ifdef CONFIG_PPC_CHRP
-        case _MACH_chrp:
-                chrp_init(r3, r4, r5, r6, r7);
-                break;
-#endif
-        }
-#endif /* CONFIG_PPC_OF */
+        prep_init(r3, r4, r5, r6, r7);
 }
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
-#ifdef CONFIG_PPC_OF
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
-extern char *of_stdout_device;
-
-static int __init set_preferred_console(void)
-{
-        struct device_node *prom_stdout;
-        char *name;
-        int offset = 0;
-
-        if (of_stdout_device == NULL)
-                return -ENODEV;
-
-        /* The user has requested a console so this is already set up. */
-        if (strstr(saved_command_line, "console="))
-                return -EBUSY;
-
-        prom_stdout = find_path_device(of_stdout_device);
-        if (!prom_stdout)
-                return -ENODEV;
-
-        name = (char *)get_property(prom_stdout, "name", NULL);
-        if (!name)
-                return -ENODEV;
-
-        if (strcmp(name, "serial") == 0) {
-                int i;
-                u32 *reg = (u32 *)get_property(prom_stdout, "reg", &i);
-                if (i > 8) {
-                        switch (reg[1]) {
-                                case 0x3f8:
-                                        offset = 0;
-                                        break;
-                                case 0x2f8:
-                                        offset = 1;
-                                        break;
-                                case 0x898:
-                                        offset = 2;
-                                        break;
-                                case 0x890:
-                                        offset = 3;
-                                        break;
-                                default:
-                                        /* We dont recognise the serial port */
-                                        return -ENODEV;
-                        }
-                }
-        } else if (strcmp(name, "ch-a") == 0)
-                offset = 0;
-        else if (strcmp(name, "ch-b") == 0)
-                offset = 1;
-        else
-                return -ENODEV;
-        return add_preferred_console("ttyS", offset, NULL);
-}
-console_initcall(set_preferred_console);
-#endif /* CONFIG_SERIAL_CORE_CONSOLE */
-#endif /* CONFIG_PPC_OF */
+#endif /* CONFIG_PPC_PREP */
 
 struct bi_record *find_bootinfo(void)
 {
@@ -590,23 +372,6 @@ void parse_bootinfo(struct bi_record *rec)
                         initrd_end = data[0] + data[1] + KERNELBASE;
                         break;
 #endif /* CONFIG_BLK_DEV_INITRD */
-#ifdef CONFIG_PPC_MULTIPLATFORM
-                case BI_MACHTYPE:
-                        /* Machine types changed with the merge. Since the
-                         * bootinfo are now deprecated, we can just hard code
-                         * the appropriate conversion here for when we are
-                         * called with yaboot which passes us a machine type
-                         * this way.
-                         */
-                        switch(data[0]) {
-                        case 1: _machine = _MACH_prep; break;
-                        case 2: _machine = _MACH_Pmac; break;
-                        case 4: _machine = _MACH_chrp; break;
-                        default:
-                                _machine = data[0];
-                        }
-                        break;
-#endif
                 case BI_MEMSIZE:
                         boot_mem_size = data[0];
                         break;
@@ -632,9 +397,6 @@ machine_init(unsigned long r3, unsigned long r4, unsigned long r5,
 #ifdef CONFIG_6xx
         ppc_md.power_save = ppc6xx_idle;
 #endif
-#ifdef CONFIG_POWER4
-        ppc_md.power_save = power4_idle;
-#endif
 
         platform_init(r3, r4, r5, r6, r7);
 
@@ -712,9 +474,8 @@ int __init ppc_init(void)
         if ( ppc_md.progress ) ppc_md.progress("             ", 0xffff);
 
         /* register CPU devices */
-        for (i = 0; i < NR_CPUS; i++)
-                if (cpu_possible(i))
-                        register_cpu(&cpu_devices[i], i, NULL);
+        for_each_possible_cpu(i)
+                register_cpu(&cpu_devices[i], i, NULL);
 
         /* call platform init */
         if (ppc_md.init != NULL) {
@@ -801,7 +562,4 @@ void __init setup_arch(char **cmdline_p)
         if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);
 
         paging_init();
-
-        /* this is for modules since _machine can be a define -- Cort */
-        ppc_md.ppc_machine = _machine;
 }
diff --git a/arch/ppc/kernel/smp-tbsync.c b/arch/ppc/kernel/smp-tbsync.c
index 2c9cd95bcea6..6a5694fcc711 100644
--- a/arch/ppc/kernel/smp-tbsync.c
+++ b/arch/ppc/kernel/smp-tbsync.c
@@ -126,8 +126,7 @@ smp_generic_give_timebase( void )
         printk("Synchronizing timebase\n");
 
         /* if this fails then this kernel won't work anyway... */
-        tbsync = kmalloc( sizeof(*tbsync), GFP_KERNEL );
-        memset( tbsync, 0, sizeof(*tbsync) );
+        tbsync = kzalloc( sizeof(*tbsync), GFP_KERNEL );
         mb();
         running = 1;
 
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c
index e55cdda6149a..f77795a64dae 100644
--- a/arch/ppc/kernel/smp.c
+++ b/arch/ppc/kernel/smp.c
@@ -311,7 +311,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         /* Backup CPU 0 state */
         __save_cpu_setup();
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 if (cpu == smp_processor_id())
                         continue;
                 /* create a process for the processor */
diff --git a/arch/ppc/kernel/swsusp.S b/arch/ppc/kernel/swsusp.S
deleted file mode 100644
index 69773cc1a85f..000000000000
--- a/arch/ppc/kernel/swsusp.S
+++ /dev/null
@@ -1,349 +0,0 @@
-#include <linux/config.h>
-#include <linux/threads.h>
-#include <asm/processor.h>
-#include <asm/page.h>
-#include <asm/cputable.h>
-#include <asm/thread_info.h>
-#include <asm/ppc_asm.h>
-#include <asm/asm-offsets.h>
-
-
-/*
- * Structure for storing CPU registers on the save area.
- */
-#define SL_SP           0
-#define SL_PC           4
-#define SL_MSR          8
-#define SL_SDR1         0xc
-#define SL_SPRG0        0x10    /* 4 sprg's */
-#define SL_DBAT0        0x20
-#define SL_IBAT0        0x28
-#define SL_DBAT1        0x30
-#define SL_IBAT1        0x38
-#define SL_DBAT2        0x40
-#define SL_IBAT2        0x48
-#define SL_DBAT3        0x50
-#define SL_IBAT3        0x58
-#define SL_TB           0x60
-#define SL_R2           0x68
-#define SL_CR           0x6c
-#define SL_LR           0x70
-#define SL_R12          0x74    /* r12 to r31 */
-#define SL_SIZE         (SL_R12 + 80)
-
-        .section .data
-        .align  5
-
-_GLOBAL(swsusp_save_area)
-        .space  SL_SIZE
-
-
-        .section .text
-        .align  5
-
-_GLOBAL(swsusp_arch_suspend)
-
-        lis     r11,swsusp_save_area@h
-        ori     r11,r11,swsusp_save_area@l
-
-        mflr    r0
-        stw     r0,SL_LR(r11)
-        mfcr    r0
-        stw     r0,SL_CR(r11)
-        stw     r1,SL_SP(r11)
-        stw     r2,SL_R2(r11)
-        stmw    r12,SL_R12(r11)
-
-        /* Save MSR & SDR1 */
-        mfmsr   r4
-        stw     r4,SL_MSR(r11)
-        mfsdr1  r4
-        stw     r4,SL_SDR1(r11)
-
-        /* Get a stable timebase and save it */
-1:      mftbu   r4
-        stw     r4,SL_TB(r11)
-        mftb    r5
-        stw     r5,SL_TB+4(r11)
-        mftbu   r3
-        cmpw    r3,r4
-        bne     1b
-
-        /* Save SPRGs */
-        mfsprg  r4,0
-        stw     r4,SL_SPRG0(r11)
-        mfsprg  r4,1
-        stw     r4,SL_SPRG0+4(r11)
-        mfsprg  r4,2
-        stw     r4,SL_SPRG0+8(r11)
-        mfsprg  r4,3
-        stw     r4,SL_SPRG0+12(r11)
-
-        /* Save BATs */
-        mfdbatu r4,0
-        stw     r4,SL_DBAT0(r11)
-        mfdbatl r4,0
-        stw     r4,SL_DBAT0+4(r11)
-        mfdbatu r4,1
-        stw     r4,SL_DBAT1(r11)
-        mfdbatl r4,1
-        stw     r4,SL_DBAT1+4(r11)
-        mfdbatu r4,2
-        stw     r4,SL_DBAT2(r11)
-        mfdbatl r4,2
-        stw     r4,SL_DBAT2+4(r11)
-        mfdbatu r4,3
-        stw     r4,SL_DBAT3(r11)
-        mfdbatl r4,3
-        stw     r4,SL_DBAT3+4(r11)
-        mfibatu r4,0
-        stw     r4,SL_IBAT0(r11)
-        mfibatl r4,0
-        stw     r4,SL_IBAT0+4(r11)
-        mfibatu r4,1
-        stw     r4,SL_IBAT1(r11)
-        mfibatl r4,1
-        stw     r4,SL_IBAT1+4(r11)
-        mfibatu r4,2
-        stw     r4,SL_IBAT2(r11)
-        mfibatl r4,2
-        stw     r4,SL_IBAT2+4(r11)
-        mfibatu r4,3
-        stw     r4,SL_IBAT3(r11)
-        mfibatl r4,3
-        stw     r4,SL_IBAT3+4(r11)
-
-#if  0
-        /* Backup various CPU config stuffs */
-        bl      __save_cpu_setup
-#endif
-        /* Call the low level suspend stuff (we should probably have made
-         * a stackframe...
-         */
-        bl      swsusp_save
-
-        /* Restore LR from the save area */
-        lis     r11,swsusp_save_area@h
-        ori     r11,r11,swsusp_save_area@l
-        lwz     r0,SL_LR(r11)
-        mtlr    r0
-
-        blr
-
-
-/* Resume code */
-_GLOBAL(swsusp_arch_resume)
-
-        /* Stop pending alitvec streams and memory accesses */
-BEGIN_FTR_SECTION
-        DSSALL
-END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
-        sync
-
-        /* Disable MSR:DR to make sure we don't take a TLB or
-         * hash miss during the copy, as our hash table will
-         * for a while be unuseable. For .text, we assume we are
-         * covered by a BAT. This works only for non-G5 at this
-         * point. G5 will need a better approach, possibly using
-         * a small temporary hash table filled with large mappings,
-         * disabling the MMU completely isn't a good option for
-         * performance reasons.
-         * (Note that 750's may have the same performance issue as
-         * the G5 in this case, we should investigate using moving
-         * BATs for these CPUs)
-         */
-        mfmsr   r0
-        sync
-        rlwinm  r0,r0,0,28,26           /* clear MSR_DR */
-        mtmsr   r0
-        sync
-        isync
-
-        /* Load ptr the list of pages to copy in r3 */
-        lis     r11,(pagedir_nosave - KERNELBASE)@h
-        ori     r11,r11,pagedir_nosave@l
-        lwz     r10,0(r11)
-
-        /* Copy the pages. This is a very basic implementation, to
-         * be replaced by something more cache efficient */
-1:
-        tophys(r3,r10)
-        li      r0,256
-        mtctr   r0
-        lwz     r11,pbe_address(r3)     /* source */
-        tophys(r5,r11)
-        lwz     r10,pbe_orig_address(r3)        /* destination */
-        tophys(r6,r10)
-2:
-        lwz     r8,0(r5)
-        lwz     r9,4(r5)
-        lwz     r10,8(r5)
-        lwz     r11,12(r5)
-        addi    r5,r5,16
-        stw     r8,0(r6)
-        stw     r9,4(r6)
-        stw     r10,8(r6)
-        stw     r11,12(r6)
-        addi    r6,r6,16
-        bdnz    2b
-        lwz             r10,pbe_next(r3)
-        cmpwi   0,r10,0
-        bne     1b
-
-        /* Do a very simple cache flush/inval of the L1 to ensure
-         * coherency of the icache
-         */
-        lis     r3,0x0002
-        mtctr   r3
-        li      r3, 0
-1:
-        lwz     r0,0(r3)
-        addi    r3,r3,0x0020
-        bdnz    1b
-        isync
-        sync
-
-        /* Now flush those cache lines */
-        lis     r3,0x0002
-        mtctr   r3
-        li      r3, 0
-1:
-        dcbf    0,r3
-        addi    r3,r3,0x0020
-        bdnz    1b
-        sync
-
-        /* Ok, we are now running with the kernel data of the old
-         * kernel fully restored. We can get to the save area
-         * easily now. As for the rest of the code, it assumes the
-         * loader kernel and the booted one are exactly identical
-         */
-        lis     r11,swsusp_save_area@h
-        ori     r11,r11,swsusp_save_area@l
-        tophys(r11,r11)
-
-#if 0
-        /* Restore various CPU config stuffs */
-        bl      __restore_cpu_setup
-#endif
-        /* Restore the BATs, and SDR1.  Then we can turn on the MMU.
-         * This is a bit hairy as we are running out of those BATs,
-         * but first, our code is probably in the icache, and we are
-         * writing the same value to the BAT, so that should be fine,
-         * though a better solution will have to be found long-term
-         */
-        lwz     r4,SL_SDR1(r11)
-        mtsdr1  r4
-        lwz     r4,SL_SPRG0(r11)
-        mtsprg  0,r4
-        lwz     r4,SL_SPRG0+4(r11)
-        mtsprg  1,r4
-        lwz     r4,SL_SPRG0+8(r11)
-        mtsprg  2,r4
-        lwz     r4,SL_SPRG0+12(r11)
-        mtsprg  3,r4
-
-#if 0
-        lwz     r4,SL_DBAT0(r11)
-        mtdbatu 0,r4
-        lwz     r4,SL_DBAT0+4(r11)
-        mtdbatl 0,r4
-        lwz     r4,SL_DBAT1(r11)
-        mtdbatu 1,r4
-        lwz     r4,SL_DBAT1+4(r11)
-        mtdbatl 1,r4
-        lwz     r4,SL_DBAT2(r11)
-        mtdbatu 2,r4
-        lwz     r4,SL_DBAT2+4(r11)
-        mtdbatl 2,r4
-        lwz     r4,SL_DBAT3(r11)
-        mtdbatu 3,r4
-        lwz     r4,SL_DBAT3+4(r11)
-        mtdbatl 3,r4
-        lwz     r4,SL_IBAT0(r11)
-        mtibatu 0,r4
-        lwz     r4,SL_IBAT0+4(r11)
-        mtibatl 0,r4
-        lwz     r4,SL_IBAT1(r11)
-        mtibatu 1,r4
-        lwz     r4,SL_IBAT1+4(r11)
-        mtibatl 1,r4
-        lwz     r4,SL_IBAT2(r11)
-        mtibatu 2,r4
-        lwz     r4,SL_IBAT2+4(r11)
-        mtibatl 2,r4
-        lwz     r4,SL_IBAT3(r11)
-        mtibatu 3,r4
-        lwz     r4,SL_IBAT3+4(r11)
-        mtibatl 3,r4
-#endif
-
-BEGIN_FTR_SECTION
-        li      r4,0
-        mtspr   SPRN_DBAT4U,r4
-        mtspr   SPRN_DBAT4L,r4
-        mtspr   SPRN_DBAT5U,r4
-        mtspr   SPRN_DBAT5L,r4
-        mtspr   SPRN_DBAT6U,r4
-        mtspr   SPRN_DBAT6L,r4
-        mtspr   SPRN_DBAT7U,r4
-        mtspr   SPRN_DBAT7L,r4
-        mtspr   SPRN_IBAT4U,r4
-        mtspr   SPRN_IBAT4L,r4
-        mtspr   SPRN_IBAT5U,r4
-        mtspr   SPRN_IBAT5L,r4
-        mtspr   SPRN_IBAT6U,r4
-        mtspr   SPRN_IBAT6L,r4
-        mtspr   SPRN_IBAT7U,r4
-        mtspr   SPRN_IBAT7L,r4
-END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_BATS)
-
-        /* Flush all TLBs */
-        lis     r4,0x1000
-1:      addic.  r4,r4,-0x1000
-        tlbie   r4
-        blt     1b
-        sync
-
-        /* restore the MSR and turn on the MMU */
-        lwz     r3,SL_MSR(r11)
-        bl      turn_on_mmu
-        tovirt(r11,r11)
-
-        /* Restore TB */
-        li      r3,0
-        mttbl   r3
-        lwz     r3,SL_TB(r11)
-        lwz     r4,SL_TB+4(r11)
-        mttbu   r3
-        mttbl   r4
-
-        /* Kick decrementer */
-        li      r0,1
-        mtdec   r0
-
-        /* Restore the callee-saved registers and return */
-        lwz     r0,SL_CR(r11)
-        mtcr    r0
-        lwz     r2,SL_R2(r11)
-        lmw     r12,SL_R12(r11)
-        lwz     r1,SL_SP(r11)
-        lwz     r0,SL_LR(r11)
-        mtlr    r0
-
-        // XXX Note: we don't really need to call swsusp_resume
-
-        li      r3,0
-        blr
-
-/* FIXME:This construct is actually not useful since we don't shut
- * down the instruction MMU, we could just flip back MSR-DR on.
- */
-turn_on_mmu:
-        mflr    r4
-        mtsrr0  r4
-        mtsrr1  r3
-        sync
-        isync
-        rfi
-
diff --git a/arch/ppc/kernel/temp.c b/arch/ppc/kernel/temp.c
deleted file mode 100644
index 26bd8ea35a4e..000000000000
--- a/arch/ppc/kernel/temp.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * temp.c       Thermal management for cpu's with Thermal Assist Units
- *
- * Written by Troy Benjegerdes <hozer@drgw.net>
- *
- * TODO:
- * dynamic power management to limit peak CPU temp (using ICTC)
- * calibration???
- *
- * Silly, crazy ideas: use cpu load (from scheduler) and ICTC to extend battery
- * life in portables, and add a 'performance/watt' metric somewhere in /proc
- */
-
-#include <linux/config.h>
-#include <linux/errno.h>
-#include <linux/jiffies.h>
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
-#include <asm/reg.h>
-#include <asm/nvram.h>
-#include <asm/cache.h>
-#include <asm/8xx_immap.h>
-#include <asm/machdep.h>
-
-static struct tau_temp
-{
-        int interrupts;
-        unsigned char low;
-        unsigned char high;
-        unsigned char grew;
-} tau[NR_CPUS];
-
-struct timer_list tau_timer;
-
-#undef DEBUG
-
-/* TODO: put these in a /proc interface, with some sanity checks, and maybe
- * dynamic adjustment to minimize # of interrupts */
-/* configurable values for step size and how much to expand the window when
- * we get an interrupt. These are based on the limit that was out of range */
-#define step_size               2       /* step size when temp goes out of range */
-#define window_expand           1       /* expand the window by this much */
-/* configurable values for shrinking the window */
-#define shrink_timer    2*HZ    /* period between shrinking the window */
-#define min_window      2       /* minimum window size, degrees C */
-
-void set_thresholds(unsigned long cpu)
-{
-#ifdef CONFIG_TAU_INT
-        /*
-         * setup THRM1,
-         * threshold, valid bit, enable interrupts, interrupt when below threshold
-         */
-        mtspr(SPRN_THRM1, THRM1_THRES(tau[cpu].low) | THRM1_V | THRM1_TIE | THRM1_TID);
-
-        /* setup THRM2,
-         * threshold, valid bit, enable interrupts, interrupt when above threshhold
-         */
-        mtspr (SPRN_THRM2, THRM1_THRES(tau[cpu].high) | THRM1_V | THRM1_TIE);
-#else
-        /* same thing but don't enable interrupts */
-        mtspr(SPRN_THRM1, THRM1_THRES(tau[cpu].low) | THRM1_V | THRM1_TID);
-        mtspr(SPRN_THRM2, THRM1_THRES(tau[cpu].high) | THRM1_V);
-#endif
-}
-
-void TAUupdate(int cpu)
-{
-        unsigned thrm;
-
-#ifdef DEBUG
-        printk("TAUupdate ");
-#endif
-
-        /* if both thresholds are crossed, the step_sizes cancel out
-         * and the window winds up getting expanded twice. */
-        if((thrm = mfspr(SPRN_THRM1)) & THRM1_TIV){ /* is valid? */
-                if(thrm & THRM1_TIN){ /* crossed low threshold */
-                        if (tau[cpu].low >= step_size){
-                                tau[cpu].low -= step_size;
-                                tau[cpu].high -= (step_size - window_expand);
-                        }
-                        tau[cpu].grew = 1;
-#ifdef DEBUG
-                        printk("low threshold crossed ");
-#endif
-                }
-        }
-        if((thrm = mfspr(SPRN_THRM2)) & THRM1_TIV){ /* is valid? */
-                if(thrm & THRM1_TIN){ /* crossed high threshold */
-                        if (tau[cpu].high <= 127-step_size){
-                                tau[cpu].low += (step_size - window_expand);
-                                tau[cpu].high += step_size;
-                        }
-                        tau[cpu].grew = 1;
-#ifdef DEBUG
-                        printk("high threshold crossed ");
-#endif
-                }
-        }
-
-#ifdef DEBUG
-        printk("grew = %d\n", tau[cpu].grew);
-#endif
-
-#ifndef CONFIG_TAU_INT /* tau_timeout will do this if not using interrupts */
-        set_thresholds(cpu);
-#endif
-
-}
-
-#ifdef CONFIG_TAU_INT
-/*
- * TAU interrupts - called when we have a thermal assist unit interrupt
- * with interrupts disabled
- */
-
-void TAUException(struct pt_regs * regs)
-{
-        int cpu = smp_processor_id();
-
-        irq_enter();
-        tau[cpu].interrupts++;
-
-        TAUupdate(cpu);
-
-        irq_exit();
-}
-#endif /* CONFIG_TAU_INT */
-
-static void tau_timeout(void * info)
-{
-        int cpu;
-        unsigned long flags;
-        int size;
-        int shrink;
-
-        /* disabling interrupts *should* be okay */
-        local_irq_save(flags);
-        cpu = smp_processor_id();
-
-#ifndef CONFIG_TAU_INT
-        TAUupdate(cpu);
-#endif
-
-        size = tau[cpu].high - tau[cpu].low;
-        if (size > min_window && ! tau[cpu].grew) {
-                /* do an exponential shrink of half the amount currently over size */
-                shrink = (2 + size - min_window) / 4;
-                if (shrink) {
-                        tau[cpu].low += shrink;
-                        tau[cpu].high -= shrink;
-                } else { /* size must have been min_window + 1 */
-                        tau[cpu].low += 1;
-#if 1 /* debug */
-                        if ((tau[cpu].high - tau[cpu].low) != min_window){
-                                printk(KERN_ERR "temp.c: line %d, logic error\n", __LINE__);
-                        }
-#endif
-                }
-        }
-
-        tau[cpu].grew = 0;
-
-        set_thresholds(cpu);
-
-        /*
-         * Do the enable every time, since otherwise a bunch of (relatively)
-         * complex sleep code needs to be added. One mtspr every time
-         * tau_timeout is called is probably not a big deal.
-         *
-         * Enable thermal sensor and set up sample interval timer
-         * need 20 us to do the compare.. until a nice 'cpu_speed' function
-         * call is implemented, just assume a 500 mhz clock. It doesn't really
-         * matter if we take too long for a compare since it's all interrupt
-         * driven anyway.
-         *
-         * use a extra long time.. (60 us @ 500 mhz)
-         */
-        mtspr(SPRN_THRM3, THRM3_SITV(500*60) | THRM3_E);
-
-        local_irq_restore(flags);
-}
-
-static void tau_timeout_smp(unsigned long unused)
-{
-
-        /* schedule ourselves to be run again */
-        mod_timer(&tau_timer, jiffies + shrink_timer) ;
-        on_each_cpu(tau_timeout, NULL, 1, 0);
-}
-
-/*
- * setup the TAU
- *
- * Set things up to use THRM1 as a temperature lower bound, and THRM2 as an upper bound.
- * Start off at zero
- */
-
-int tau_initialized = 0;
-
-void __init TAU_init_smp(void * info)
-{
-        unsigned long cpu = smp_processor_id();
-
-        /* set these to a reasonable value and let the timer shrink the
-         * window */
-        tau[cpu].low = 5;
-        tau[cpu].high = 120;
-
-        set_thresholds(cpu);
-}
-
-int __init TAU_init(void)
-{
-        /* We assume in SMP that if one CPU has TAU support, they
-         * all have it --BenH
-         */
-        if (!cpu_has_feature(CPU_FTR_TAU)) {
-                printk("Thermal assist unit not available\n");
-                tau_initialized = 0;
-                return 1;
-        }
-
-
-        /* first, set up the window shrinking timer */
-        init_timer(&tau_timer);
-        tau_timer.function = tau_timeout_smp;
-        tau_timer.expires = jiffies + shrink_timer;
-        add_timer(&tau_timer);
-
-        on_each_cpu(TAU_init_smp, NULL, 1, 0);
-
-        printk("Thermal assist unit ");
-#ifdef CONFIG_TAU_INT
-        printk("using interrupts, ");
-#else
-        printk("using timers, ");
-#endif
-        printk("shrink_timer: %d jiffies\n", shrink_timer);
-        tau_initialized = 1;
-
-        return 0;
-}
-
-__initcall(TAU_init);
-
-/*
- * return current temp
- */
-
-u32 cpu_temp_both(unsigned long cpu)
-{
-        return ((tau[cpu].high << 16) | tau[cpu].low);
-}
-
-int cpu_temp(unsigned long cpu)
-{
-        return ((tau[cpu].high + tau[cpu].low) / 2);
-}
-
-int tau_interrupts(unsigned long cpu)
-{
-        return (tau[cpu].interrupts);
-}
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index 6d0a1838d94c..1c0d68026abd 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/kernel/traps.c
- *
  *  Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *
  *  This program is free software; you can redistribute it and/or
diff --git a/arch/ppc/lib/rheap.c b/arch/ppc/lib/rheap.c
index 42c5de2c898f..31e511856dc5 100644
--- a/arch/ppc/lib/rheap.c
+++ b/arch/ppc/lib/rheap.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/rheap.c
- *
  * A Remote Heap.  Remote means that we don't touch the memory that the
  * heap points to. Normal heap implementations use the memory they manage
  * to place their list. We cannot do that because the memory we manage may
diff --git a/arch/ppc/lib/strcase.c b/arch/ppc/lib/strcase.c
index 36b521091bbc..3b0094cc2b52 100644
--- a/arch/ppc/lib/strcase.c
+++ b/arch/ppc/lib/strcase.c
@@ -1,4 +1,5 @@
 #include <linux/ctype.h>
+#include <linux/types.h>
 
 int strcasecmp(const char *s1, const char *s2)
 {
@@ -11,7 +12,7 @@ int strcasecmp(const char *s1, const char *s2)
         return c1 - c2;
 }
 
-int strncasecmp(const char *s1, const char *s2, int n)
+int strncasecmp(const char *s1, const char *s2, size_t n)
 {
         int c1, c2;
 
diff --git a/arch/ppc/math-emu/Makefile b/arch/ppc/math-emu/Makefile
deleted file mode 100644
index 754143e8936b..000000000000
--- a/arch/ppc/math-emu/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-obj-y                           := math.o fmr.o lfd.o stfd.o
-
-obj-$(CONFIG_MATH_EMULATION)    += fabs.o fadd.o fadds.o fcmpo.o fcmpu.o \
-                                        fctiw.o fctiwz.o fdiv.o fdivs.o \
-                                        fmadd.o fmadds.o fmsub.o fmsubs.o \
-                                        fmul.o fmuls.o fnabs.o fneg.o types.o \
-                                        fnmadd.o fnmadds.o fnmsub.o fnmsubs.o \
-                                        fres.o frsp.o frsqrte.o fsel.o lfs.o \
-                                        fsqrt.o fsqrts.o fsub.o fsubs.o \
-                                        mcrfs.o mffs.o mtfsb0.o mtfsb1.o \
-                                        mtfsf.o mtfsfi.o stfiwx.o stfs.o \
-                                        udivmodti4.o
diff --git a/arch/ppc/math-emu/double.h b/arch/ppc/math-emu/double.h
deleted file mode 100644
index ffba8b67f059..000000000000
--- a/arch/ppc/math-emu/double.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Definitions for IEEE Double Precision
- */
-
-#if _FP_W_TYPE_SIZE < 32
-#error "Here's a nickel kid.  Go buy yourself a real computer."
-#endif
-
-#if _FP_W_TYPE_SIZE < 64
-#define _FP_FRACTBITS_D         (2 * _FP_W_TYPE_SIZE)
-#else
-#define _FP_FRACTBITS_D         _FP_W_TYPE_SIZE
-#endif
-
-#define _FP_FRACBITS_D          53
-#define _FP_FRACXBITS_D         (_FP_FRACTBITS_D - _FP_FRACBITS_D)
-#define _FP_WFRACBITS_D         (_FP_WORKBITS + _FP_FRACBITS_D)
-#define _FP_WFRACXBITS_D        (_FP_FRACTBITS_D - _FP_WFRACBITS_D)
-#define _FP_EXPBITS_D           11
-#define _FP_EXPBIAS_D           1023
-#define _FP_EXPMAX_D            2047
-
-#define _FP_QNANBIT_D           \
-        ((_FP_W_TYPE)1 << ((_FP_FRACBITS_D-2) % _FP_W_TYPE_SIZE))
-#define _FP_IMPLBIT_D           \
-        ((_FP_W_TYPE)1 << ((_FP_FRACBITS_D-1) % _FP_W_TYPE_SIZE))
-#define _FP_OVERFLOW_D          \
-        ((_FP_W_TYPE)1 << (_FP_WFRACBITS_D % _FP_W_TYPE_SIZE))
-
-#if _FP_W_TYPE_SIZE < 64
-
-union _FP_UNION_D
-{
-  double flt;
-  struct {
-#if __BYTE_ORDER == __BIG_ENDIAN
-    unsigned sign  : 1;
-    unsigned exp   : _FP_EXPBITS_D;
-    unsigned frac1 : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0) - _FP_W_TYPE_SIZE;
-    unsigned frac0 : _FP_W_TYPE_SIZE;
-#else
-    unsigned frac0 : _FP_W_TYPE_SIZE;
-    unsigned frac1 : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0) - _FP_W_TYPE_SIZE;
-    unsigned exp   : _FP_EXPBITS_D;
-    unsigned sign  : 1;
-#endif
-  } bits __attribute__((packed));
-};
-
-#define FP_DECL_D(X)            _FP_DECL(2,X)
-#define FP_UNPACK_RAW_D(X,val)  _FP_UNPACK_RAW_2(D,X,val)
-#define FP_PACK_RAW_D(val,X)    _FP_PACK_RAW_2(D,val,X)
-
-#define FP_UNPACK_D(X,val)              \
-  do {                                  \
-    _FP_UNPACK_RAW_2(D,X,val);          \
-    _FP_UNPACK_CANONICAL(D,2,X);        \
-  } while (0)
-
-#define FP_PACK_D(val,X)                \
-  do {                                  \
-    _FP_PACK_CANONICAL(D,2,X);          \
-    _FP_PACK_RAW_2(D,val,X);            \
-  } while (0)
-
-#define FP_NEG_D(R,X)           _FP_NEG(D,2,R,X)
-#define FP_ADD_D(R,X,Y)         _FP_ADD(D,2,R,X,Y)
-#define FP_SUB_D(R,X,Y)         _FP_SUB(D,2,R,X,Y)
-#define FP_MUL_D(R,X,Y)         _FP_MUL(D,2,R,X,Y)
-#define FP_DIV_D(R,X,Y)         _FP_DIV(D,2,R,X,Y)
-#define FP_SQRT_D(R,X)          _FP_SQRT(D,2,R,X)
-
-#define FP_CMP_D(r,X,Y,un)      _FP_CMP(D,2,r,X,Y,un)
-#define FP_CMP_EQ_D(r,X,Y)      _FP_CMP_EQ(D,2,r,X,Y)
-
-#define FP_TO_INT_D(r,X,rsz,rsg)  _FP_TO_INT(D,2,r,X,rsz,rsg)
-#define FP_FROM_INT_D(X,r,rs,rt)  _FP_FROM_INT(D,2,X,r,rs,rt)
-
-#else
-
-union _FP_UNION_D
-{
-  double flt;
-  struct {
-#if __BYTE_ORDER == __BIG_ENDIAN
-    unsigned sign : 1;
-    unsigned exp  : _FP_EXPBITS_D;
-    unsigned long frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);
-#else
-    unsigned long frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);
-    unsigned exp  : _FP_EXPBITS_D;
-    unsigned sign : 1;
-#endif
-  } bits __attribute__((packed));
-};
-
-#define FP_DECL_D(X)            _FP_DECL(1,X)
-#define FP_UNPACK_RAW_D(X,val)  _FP_UNPACK_RAW_1(D,X,val)
-#define FP_PACK_RAW_D(val,X)    _FP_PACK_RAW_1(D,val,X)
-
-#define FP_UNPACK_D(X,val)              \
-  do {                                  \
-    _FP_UNPACK_RAW_1(D,X,val);          \
-    _FP_UNPACK_CANONICAL(D,1,X);        \
-  } while (0)
-
-#define FP_PACK_D(val,X)                \
-  do {                                  \
-    _FP_PACK_CANONICAL(D,1,X);          \
-    _FP_PACK_RAW_1(D,val,X);            \
-  } while (0)
-
-#define FP_NEG_D(R,X)           _FP_NEG(D,1,R,X)
-#define FP_ADD_D(R,X,Y)         _FP_ADD(D,1,R,X,Y)
-#define FP_SUB_D(R,X,Y)         _FP_SUB(D,1,R,X,Y)
-#define FP_MUL_D(R,X,Y)         _FP_MUL(D,1,R,X,Y)
-#define FP_DIV_D(R,X,Y)         _FP_DIV(D,1,R,X,Y)
-#define FP_SQRT_D(R,X)          _FP_SQRT(D,1,R,X)
-
-/* The implementation of _FP_MUL_D and _FP_DIV_D should be chosen by
-   the target machine.  */
-
-#define FP_CMP_D(r,X,Y,un)      _FP_CMP(D,1,r,X,Y,un)
-#define FP_CMP_EQ_D(r,X,Y)      _FP_CMP_EQ(D,1,r,X,Y)
-
-#define FP_TO_INT_D(r,X,rsz,rsg)  _FP_TO_INT(D,1,r,X,rsz,rsg)
-#define FP_FROM_INT_D(X,r,rs,rt)  _FP_FROM_INT(D,1,X,r,rs,rt)
-
-#endif /* W_TYPE_SIZE < 64 */
diff --git a/arch/ppc/math-emu/fabs.c b/arch/ppc/math-emu/fabs.c
deleted file mode 100644
index 41f0617f3d3a..000000000000
--- a/arch/ppc/math-emu/fabs.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-fabs(u32 *frD, u32 *frB)
-{
-        frD[0] = frB[0] & 0x7fffffff;
-        frD[1] = frB[1];
-
-#ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-        dump_double(frD);
-        printk("\n");
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/fadd.c b/arch/ppc/math-emu/fadd.c
deleted file mode 100644
index fc8836488b64..000000000000
--- a/arch/ppc/math-emu/fadd.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fadd(void *frD, void *frA, void *frB)
-{
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(R);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        if (A_s != B_s && A_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, A, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_D(frD, R));
-}
diff --git a/arch/ppc/math-emu/fadds.c b/arch/ppc/math-emu/fadds.c
deleted file mode 100644
index 93025b6c8f3c..000000000000
--- a/arch/ppc/math-emu/fadds.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-fadds(void *frD, void *frA, void *frB)
-{
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(R);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        if (A_s != B_s && A_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, A, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_DS(frD, R));
-}
diff --git a/arch/ppc/math-emu/fcmpo.c b/arch/ppc/math-emu/fcmpo.c
deleted file mode 100644
index 4efac394b4cb..000000000000
--- a/arch/ppc/math-emu/fcmpo.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fcmpo(u32 *ccr, int crfD, void *frA, void *frB)
-{
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        int code[4] = { (1 << 3), (1 << 1), (1 << 2), (1 << 0) };
-        long cmp;
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p (%08x) %d %p %p\n", __FUNCTION__, ccr, *ccr, crfD, frA, frB);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        if (A_c == FP_CLS_NAN || B_c == FP_CLS_NAN)
-                ret |= EFLAG_VXVC;
-
-        FP_CMP_D(cmp, A, B, 2);
-        cmp = code[(cmp + 1) & 3];
-
-        __FPU_FPSCR &= ~(0x1f000);
-        __FPU_FPSCR |= (cmp << 12);
-
-        *ccr &= ~(15 << ((7 - crfD) << 2));
-        *ccr |= (cmp << ((7 - crfD) << 2));
-
-#ifdef DEBUG
-        printk("CR: %08x\n", *ccr);
-#endif
-
-        return ret;
-}
diff --git a/arch/ppc/math-emu/fcmpu.c b/arch/ppc/math-emu/fcmpu.c
deleted file mode 100644
index b7e33176e618..000000000000
--- a/arch/ppc/math-emu/fcmpu.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fcmpu(u32 *ccr, int crfD, void *frA, void *frB)
-{
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        int code[4] = { (1 << 3), (1 << 1), (1 << 2), (1 << 0) };
-        long cmp;
-
-#ifdef DEBUG
-        printk("%s: %p (%08x) %d %p %p\n", __FUNCTION__, ccr, *ccr, crfD, frA, frB);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        FP_CMP_D(cmp, A, B, 2);
-        cmp = code[(cmp + 1) & 3];
-
-        __FPU_FPSCR &= ~(0x1f000);
-        __FPU_FPSCR |= (cmp << 12);
-
-        *ccr &= ~(15 << ((7 - crfD) << 2));
-        *ccr |= (cmp << ((7 - crfD) << 2));
-
-#ifdef DEBUG
-        printk("CR: %08x\n", *ccr);
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/fctiw.c b/arch/ppc/math-emu/fctiw.c
deleted file mode 100644
index 3b3c98b840cf..000000000000
--- a/arch/ppc/math-emu/fctiw.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fctiw(u32 *frD, void *frB)
-{
-        FP_DECL_D(B);
-        unsigned int r;
-
-        __FP_UNPACK_D(B, frB);
-        FP_TO_INT_D(r, B, 32, 1);
-        frD[1] = r;
-
-#ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-        dump_double(frD);
-        printk("\n");
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/fctiwz.c b/arch/ppc/math-emu/fctiwz.c
deleted file mode 100644
index 7717eb6fcfb6..000000000000
--- a/arch/ppc/math-emu/fctiwz.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fctiwz(u32 *frD, void *frB)
-{
-        FP_DECL_D(B);
-        u32 fpscr;
-        unsigned int r;
-
-        fpscr = __FPU_FPSCR;
-        __FPU_FPSCR &= ~(3);
-        __FPU_FPSCR |= FP_RND_ZERO;
-
-        __FP_UNPACK_D(B, frB);
-        FP_TO_INT_D(r, B, 32, 1);
-        frD[1] = r;
-
-        __FPU_FPSCR = fpscr;
-
-#ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-        dump_double(frD);
-        printk("\n");
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/fdiv.c b/arch/ppc/math-emu/fdiv.c
deleted file mode 100644
index f2fba825b2d0..000000000000
--- a/arch/ppc/math-emu/fdiv.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fdiv(void *frD, void *frA, void *frB)
-{
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(R);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
-                ret |= EFLAG_VXZDZ;
-#ifdef DEBUG
-                printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__);
-#endif
-        }
-        if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
-                ret |= EFLAG_VXIDI;
-#ifdef DEBUG
-                printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__);
-#endif
-        }
-
-        if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {
-                ret |= EFLAG_DIVZERO;
-                if (__FPU_TRAP_P(EFLAG_DIVZERO))
-                        return ret;
-        }
-        FP_DIV_D(R, A, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_D(frD, R));
-}
diff --git a/arch/ppc/math-emu/fdivs.c b/arch/ppc/math-emu/fdivs.c
deleted file mode 100644
index b971196e3175..000000000000
--- a/arch/ppc/math-emu/fdivs.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-fdivs(void *frD, void *frA, void *frB)
-{
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(R);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
-                ret |= EFLAG_VXZDZ;
-#ifdef DEBUG
-                printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__);
-#endif
-        }
-        if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
-                ret |= EFLAG_VXIDI;
-#ifdef DEBUG
-                printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__);
-#endif
-        }
-
-        if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {
-                ret |= EFLAG_DIVZERO;
-                if (__FPU_TRAP_P(EFLAG_DIVZERO))
-                        return ret;
-        }
-
-        FP_DIV_D(R, A, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_DS(frD, R));
-}
diff --git a/arch/ppc/math-emu/fmadd.c b/arch/ppc/math-emu/fmadd.c
deleted file mode 100644
index 0a1dbce793e9..000000000000
--- a/arch/ppc/math-emu/fmadd.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fmadd(void *frD, void *frA, void *frB, void *frC)
-{
-        FP_DECL_D(R);
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(C);
-        FP_DECL_D(T);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-        printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-        if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-            (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                ret |= EFLAG_VXIMZ;
-
-        FP_MUL_D(T, A, C);
-
-        if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, T, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_D(frD, R));
-}
diff --git a/arch/ppc/math-emu/fmadds.c b/arch/ppc/math-emu/fmadds.c
deleted file mode 100644
index 0f70bba9445e..000000000000
--- a/arch/ppc/math-emu/fmadds.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-fmadds(void *frD, void *frA, void *frB, void *frC)
-{
-        FP_DECL_D(R);
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(C);
-        FP_DECL_D(T);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-        printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-        if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-            (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                ret |= EFLAG_VXIMZ;
-
-        FP_MUL_D(T, A, C);
-
-        if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, T, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_DS(frD, R));
-}
diff --git a/arch/ppc/math-emu/fmr.c b/arch/ppc/math-emu/fmr.c
deleted file mode 100644
index 28df700c0c7e..000000000000
--- a/arch/ppc/math-emu/fmr.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-fmr(u32 *frD, u32 *frB)
-{
-        frD[0] = frB[0];
-        frD[1] = frB[1];
-
-#ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-        dump_double(frD);
-        printk("\n");
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/fmsub.c b/arch/ppc/math-emu/fmsub.c
deleted file mode 100644
index 203fd48a6fec..000000000000
--- a/arch/ppc/math-emu/fmsub.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fmsub(void *frD, void *frA, void *frB, void *frC)
-{
-        FP_DECL_D(R);
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(C);
-        FP_DECL_D(T);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-        printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-        if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-            (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                ret |= EFLAG_VXIMZ;
-
-        FP_MUL_D(T, A, C);
-
-        if (B_c != FP_CLS_NAN)
-                B_s ^= 1;
-
-        if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, T, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_D(frD, R));
-}
diff --git a/arch/ppc/math-emu/fmsubs.c b/arch/ppc/math-emu/fmsubs.c
deleted file mode 100644
index 8ce68624c189..000000000000
--- a/arch/ppc/math-emu/fmsubs.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-fmsubs(void *frD, void *frA, void *frB, void *frC)
-{
-        FP_DECL_D(R);
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(C);
-        FP_DECL_D(T);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-        printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-        if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-            (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                ret |= EFLAG_VXIMZ;
-
-        FP_MUL_D(T, A, C);
-
-        if (B_c != FP_CLS_NAN)
-                B_s ^= 1;
-
-        if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, T, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_DS(frD, R));
-}
diff --git a/arch/ppc/math-emu/fmul.c b/arch/ppc/math-emu/fmul.c
deleted file mode 100644
index 66c7e79aae2e..000000000000
--- a/arch/ppc/math-emu/fmul.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fmul(void *frD, void *frA, void *frB)
-{
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(R);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-               A_s, A_f1, A_f0, A_e, A_c, A_f1, A_f0, A_e + 1023);
-        printk("B: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-               B_s, B_f1, B_f0, B_e, B_c, B_f1, B_f0, B_e + 1023);
-#endif
-
-        if ((A_c == FP_CLS_INF && B_c == FP_CLS_ZERO) ||
-            (A_c == FP_CLS_ZERO && B_c == FP_CLS_INF))
-                ret |= EFLAG_VXIMZ;
-
-        FP_MUL_D(R, A, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-               R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);
-#endif
-
-        return (ret | __FP_PACK_D(frD, R));
-}
diff --git a/arch/ppc/math-emu/fmuls.c b/arch/ppc/math-emu/fmuls.c
deleted file mode 100644
index 26bc4278271c..000000000000
--- a/arch/ppc/math-emu/fmuls.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-fmuls(void *frD, void *frA, void *frB)
-{
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(R);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-               A_s, A_f1, A_f0, A_e, A_c, A_f1, A_f0, A_e + 1023);
-        printk("B: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-               B_s, B_f1, B_f0, B_e, B_c, B_f1, B_f0, B_e + 1023);
-#endif
-
-        if ((A_c == FP_CLS_INF && B_c == FP_CLS_ZERO) ||
-            (A_c == FP_CLS_ZERO && B_c == FP_CLS_INF))
-                ret |= EFLAG_VXIMZ;
-
-        FP_MUL_D(R, A, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-               R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);
-#endif
-
-        return (ret | __FP_PACK_DS(frD, R));
-}
diff --git a/arch/ppc/math-emu/fnabs.c b/arch/ppc/math-emu/fnabs.c
deleted file mode 100644
index c6b913d179e0..000000000000
--- a/arch/ppc/math-emu/fnabs.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-fnabs(u32 *frD, u32 *frB)
-{
-        frD[0] = frB[0] | 0x80000000;
-        frD[1] = frB[1];
-
-#ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-        dump_double(frD);
-        printk("\n");
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/fneg.c b/arch/ppc/math-emu/fneg.c
deleted file mode 100644
index fe9a98deff69..000000000000
--- a/arch/ppc/math-emu/fneg.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-fneg(u32 *frD, u32 *frB)
-{
-        frD[0] = frB[0] ^ 0x80000000;
-        frD[1] = frB[1];
-
-#ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-        dump_double(frD);
-        printk("\n");
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/fnmadd.c b/arch/ppc/math-emu/fnmadd.c
deleted file mode 100644
index 7f312276d920..000000000000
--- a/arch/ppc/math-emu/fnmadd.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fnmadd(void *frD, void *frA, void *frB, void *frC)
-{
-        FP_DECL_D(R);
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(C);
-        FP_DECL_D(T);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-        printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-        if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-            (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                ret |= EFLAG_VXIMZ;
-
-        FP_MUL_D(T, A, C);
-
-        if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, T, B);
-
-        if (R_c != FP_CLS_NAN)
-                R_s ^= 1;
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_D(frD, R));
-}
diff --git a/arch/ppc/math-emu/fnmadds.c b/arch/ppc/math-emu/fnmadds.c
deleted file mode 100644
index 65454c9c70bc..000000000000
--- a/arch/ppc/math-emu/fnmadds.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-fnmadds(void *frD, void *frA, void *frB, void *frC)
-{
-        FP_DECL_D(R);
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(C);
-        FP_DECL_D(T);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-        printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-        if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-            (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                ret |= EFLAG_VXIMZ;
-
-        FP_MUL_D(T, A, C);
-
-        if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, T, B);
-
-        if (R_c != FP_CLS_NAN)
-                R_s ^= 1;
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_DS(frD, R));
-}
diff --git a/arch/ppc/math-emu/fnmsub.c b/arch/ppc/math-emu/fnmsub.c
deleted file mode 100644
index f1ca7482b5f0..000000000000
--- a/arch/ppc/math-emu/fnmsub.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fnmsub(void *frD, void *frA, void *frB, void *frC)
-{
-        FP_DECL_D(R);
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(C);
-        FP_DECL_D(T);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-        printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-        if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-            (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                ret |= EFLAG_VXIMZ;
-
-        FP_MUL_D(T, A, C);
-
-        if (B_c != FP_CLS_NAN)
-                B_s ^= 1;
-
-        if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, T, B);
-
-        if (R_c != FP_CLS_NAN)
-                R_s ^= 1;
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_D(frD, R));
-}
diff --git a/arch/ppc/math-emu/fnmsubs.c b/arch/ppc/math-emu/fnmsubs.c
deleted file mode 100644
index 5c9a09a87dc7..000000000000
--- a/arch/ppc/math-emu/fnmsubs.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-fnmsubs(void *frD, void *frA, void *frB, void *frC)
-{
-        FP_DECL_D(R);
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(C);
-        FP_DECL_D(T);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-        printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-        if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-            (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                ret |= EFLAG_VXIMZ;
-
-        FP_MUL_D(T, A, C);
-
-        if (B_c != FP_CLS_NAN)
-                B_s ^= 1;
-
-        if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, T, B);
-
-        if (R_c != FP_CLS_NAN)
-                R_s ^= 1;
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_DS(frD, R));
-}
diff --git a/arch/ppc/math-emu/fres.c b/arch/ppc/math-emu/fres.c
deleted file mode 100644
index ec11e46d20af..000000000000
--- a/arch/ppc/math-emu/fres.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-fres(void *frD, void *frB)
-{
-#ifdef DEBUG
-        printk("%s: %p %p\n", __FUNCTION__, frD, frB);
-#endif
-        return -ENOSYS;
-}
diff --git a/arch/ppc/math-emu/frsp.c b/arch/ppc/math-emu/frsp.c
deleted file mode 100644
index d879b2a3d0c9..000000000000
--- a/arch/ppc/math-emu/frsp.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-frsp(void *frD, void *frB)
-{
-        FP_DECL_D(B);
-
-#ifdef DEBUG
-        printk("%s: D %p, B %p\n", __FUNCTION__, frD, frB);
-#endif
-
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        return __FP_PACK_DS(frD, B);
-}
diff --git a/arch/ppc/math-emu/frsqrte.c b/arch/ppc/math-emu/frsqrte.c
deleted file mode 100644
index a11ae1829850..000000000000
--- a/arch/ppc/math-emu/frsqrte.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-frsqrte(void *frD, void *frB)
-{
-#ifdef DEBUG
-        printk("%s: %p %p\n", __FUNCTION__, frD, frB);
-#endif
-        return 0;
-}
diff --git a/arch/ppc/math-emu/fsel.c b/arch/ppc/math-emu/fsel.c
deleted file mode 100644
index e36e6e72819a..000000000000
--- a/arch/ppc/math-emu/fsel.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fsel(u32 *frD, void *frA, u32 *frB, u32 *frC)
-{
-        FP_DECL_D(A);
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %08x %08x\n", frB[0], frB[1]);
-        printk("C: %08x %08x\n", frC[0], frC[1]);
-#endif
-
-        if (A_c == FP_CLS_NAN || (A_c != FP_CLS_ZERO && A_s)) {
-                frD[0] = frB[0];
-                frD[1] = frB[1];
-        } else {
-                frD[0] = frC[0];
-                frD[1] = frC[1];
-        }
-
-#ifdef DEBUG
-        printk("D: %08x.%08x\n", frD[0], frD[1]);
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/fsqrt.c b/arch/ppc/math-emu/fsqrt.c
deleted file mode 100644
index 6f8319f64a8a..000000000000
--- a/arch/ppc/math-emu/fsqrt.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fsqrt(void *frD, void *frB)
-{
-        FP_DECL_D(B);
-        FP_DECL_D(R);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB);
-#endif
-
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        if (B_s && B_c != FP_CLS_ZERO)
-                ret |= EFLAG_VXSQRT;
-        if (B_c == FP_CLS_NAN)
-                ret |= EFLAG_VXSNAN;
-
-        FP_SQRT_D(R, B);
-
-#ifdef DEBUG
-        printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_D(frD, R));
-}
diff --git a/arch/ppc/math-emu/fsqrts.c b/arch/ppc/math-emu/fsqrts.c
deleted file mode 100644
index 3b2b1cf55c12..000000000000
--- a/arch/ppc/math-emu/fsqrts.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-fsqrts(void *frD, void *frB)
-{
-        FP_DECL_D(B);
-        FP_DECL_D(R);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB);
-#endif
-
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        if (B_s && B_c != FP_CLS_ZERO)
-                ret |= EFLAG_VXSQRT;
-        if (B_c == FP_CLS_NAN)
-                ret |= EFLAG_VXSNAN;
-
-        FP_SQRT_D(R, B);
-
-#ifdef DEBUG
-        printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_DS(frD, R));
-}
diff --git a/arch/ppc/math-emu/fsub.c b/arch/ppc/math-emu/fsub.c
deleted file mode 100644
index 956679042bb2..000000000000
--- a/arch/ppc/math-emu/fsub.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-
-int
-fsub(void *frD, void *frA, void *frB)
-{
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(R);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        if (B_c != FP_CLS_NAN)
-                B_s ^= 1;
-
-        if (A_s != B_s && A_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, A, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_D(frD, R));
-}
diff --git a/arch/ppc/math-emu/fsubs.c b/arch/ppc/math-emu/fsubs.c
deleted file mode 100644
index 3428117dfe8c..000000000000
--- a/arch/ppc/math-emu/fsubs.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-fsubs(void *frD, void *frA, void *frB)
-{
-        FP_DECL_D(A);
-        FP_DECL_D(B);
-        FP_DECL_D(R);
-        int ret = 0;
-
-#ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-#endif
-
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-        printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-        if (B_c != FP_CLS_NAN)
-                B_s ^= 1;
-
-        if (A_s != B_s && A_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
-        FP_ADD_D(R, A, B);
-
-#ifdef DEBUG
-        printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return (ret | __FP_PACK_DS(frD, R));
-}
diff --git a/arch/ppc/math-emu/lfd.c b/arch/ppc/math-emu/lfd.c
deleted file mode 100644
index 7d38101c329b..000000000000
--- a/arch/ppc/math-emu/lfd.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "sfp-machine.h"
-#include "double.h"
-
-int
-lfd(void *frD, void *ea)
-{
-        if (copy_from_user(frD, ea, sizeof(double)))
-                return -EFAULT;
-#ifdef DEBUG
-        printk("%s: D %p, ea %p: ", __FUNCTION__, frD, ea);
-        dump_double(frD);
-        printk("\n");
-#endif
-        return 0;
-}
diff --git a/arch/ppc/math-emu/lfs.c b/arch/ppc/math-emu/lfs.c
deleted file mode 100644
index c86dee3d7655..000000000000
--- a/arch/ppc/math-emu/lfs.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-lfs(void *frD, void *ea)
-{
-        FP_DECL_D(R);
-        FP_DECL_S(A);
-        float f;
-
-#ifdef DEBUG
-        printk("%s: D %p, ea %p\n", __FUNCTION__, frD, ea);
-#endif
-
-        if (copy_from_user(&f, ea, sizeof(float)))
-                return -EFAULT;
-
-        __FP_UNPACK_S(A, &f);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %ld (%ld) [%08lx]\n", A_s, A_f, A_e, A_c,
-               *(unsigned long *)&f);
-#endif
-
-        FP_CONV(D, S, 2, 1, R, A);
-
-#ifdef DEBUG
-        printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-        return __FP_PACK_D(frD, R);
-}
diff --git a/arch/ppc/math-emu/math.c b/arch/ppc/math-emu/math.c
deleted file mode 100644
index b7dff53a7103..000000000000
--- a/arch/ppc/math-emu/math.c
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * arch/ppc/math-emu/math.c
- *
- * Copyright (C) 1999  Eddie C. Dost  (ecd@atecom.com)
- */
-
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-
-#include <asm/uaccess.h>
-#include <asm/reg.h>
-
-#include "sfp-machine.h"
-#include "double.h"
-
-#define FLOATFUNC(x)    extern int x(void *, void *, void *, void *)
-
-FLOATFUNC(fadd);
-FLOATFUNC(fadds);
-FLOATFUNC(fdiv);
-FLOATFUNC(fdivs);
-FLOATFUNC(fmul);
-FLOATFUNC(fmuls);
-FLOATFUNC(fsub);
-FLOATFUNC(fsubs);
-
-FLOATFUNC(fmadd);
-FLOATFUNC(fmadds);
-FLOATFUNC(fmsub);
-FLOATFUNC(fmsubs);
-FLOATFUNC(fnmadd);
-FLOATFUNC(fnmadds);
-FLOATFUNC(fnmsub);
-FLOATFUNC(fnmsubs);
-
-FLOATFUNC(fctiw);
-FLOATFUNC(fctiwz);
-FLOATFUNC(frsp);
-
-FLOATFUNC(fcmpo);
-FLOATFUNC(fcmpu);
-
-FLOATFUNC(mcrfs);
-FLOATFUNC(mffs);
-FLOATFUNC(mtfsb0);
-FLOATFUNC(mtfsb1);
-FLOATFUNC(mtfsf);
-FLOATFUNC(mtfsfi);
-
-FLOATFUNC(lfd);
-FLOATFUNC(lfs);
-
-FLOATFUNC(stfd);
-FLOATFUNC(stfs);
-FLOATFUNC(stfiwx);
-
-FLOATFUNC(fabs);
-FLOATFUNC(fmr);
-FLOATFUNC(fnabs);
-FLOATFUNC(fneg);
-
-/* Optional */
-FLOATFUNC(fres);
-FLOATFUNC(frsqrte);
-FLOATFUNC(fsel);
-FLOATFUNC(fsqrt);
-FLOATFUNC(fsqrts);
-
-
-#define OP31            0x1f            /*   31 */
-#define LFS             0x30            /*   48 */
-#define LFSU            0x31            /*   49 */
-#define LFD             0x32            /*   50 */
-#define LFDU            0x33            /*   51 */
-#define STFS            0x34            /*   52 */
-#define STFSU           0x35            /*   53 */
-#define STFD            0x36            /*   54 */
-#define STFDU           0x37            /*   55 */
-#define OP59            0x3b            /*   59 */
-#define OP63            0x3f            /*   63 */
-
-/* Opcode 31: */
-/* X-Form: */
-#define LFSX            0x217           /*  535 */
-#define LFSUX           0x237           /*  567 */
-#define LFDX            0x257           /*  599 */
-#define LFDUX           0x277           /*  631 */
-#define STFSX           0x297           /*  663 */
-#define STFSUX          0x2b7           /*  695 */
-#define STFDX           0x2d7           /*  727 */
-#define STFDUX          0x2f7           /*  759 */
-#define STFIWX          0x3d7           /*  983 */
-
-/* Opcode 59: */
-/* A-Form: */
-#define FDIVS           0x012           /*   18 */
-#define FSUBS           0x014           /*   20 */
-#define FADDS           0x015           /*   21 */
-#define FSQRTS          0x016           /*   22 */
-#define FRES            0x018           /*   24 */
-#define FMULS           0x019           /*   25 */
-#define FMSUBS          0x01c           /*   28 */
-#define FMADDS          0x01d           /*   29 */
-#define FNMSUBS         0x01e           /*   30 */
-#define FNMADDS         0x01f           /*   31 */
-
-/* Opcode 63: */
-/* A-Form: */
-#define FDIV            0x012           /*   18 */
-#define FSUB            0x014           /*   20 */
-#define FADD            0x015           /*   21 */
-#define FSQRT           0x016           /*   22 */
-#define FSEL            0x017           /*   23 */
-#define FMUL            0x019           /*   25 */
-#define FRSQRTE         0x01a           /*   26 */
-#define FMSUB           0x01c           /*   28 */
-#define FMADD           0x01d           /*   29 */
-#define FNMSUB          0x01e           /*   30 */
-#define FNMADD          0x01f           /*   31 */
-
-/* X-Form: */
-#define FCMPU           0x000           /*    0 */
-#define FRSP            0x00c           /*   12 */
-#define FCTIW           0x00e           /*   14 */
-#define FCTIWZ          0x00f           /*   15 */
-#define FCMPO           0x020           /*   32 */
-#define MTFSB1          0x026           /*   38 */
-#define FNEG            0x028           /*   40 */
-#define MCRFS           0x040           /*   64 */
-#define MTFSB0          0x046           /*   70 */
-#define FMR             0x048           /*   72 */
-#define MTFSFI          0x086           /*  134 */
-#define FNABS           0x088           /*  136 */
-#define FABS            0x108           /*  264 */
-#define MFFS            0x247           /*  583 */
-#define MTFSF           0x2c7           /*  711 */
-
-
-#define AB      2
-#define AC      3
-#define ABC     4
-#define D       5
-#define DU      6
-#define X       7
-#define XA      8
-#define XB      9
-#define XCR     11
-#define XCRB    12
-#define XCRI    13
-#define XCRL    16
-#define XE      14
-#define XEU     15
-#define XFLB    10
-
-#ifdef CONFIG_MATH_EMULATION
-static int
-record_exception(struct pt_regs *regs, int eflag)
-{
-        u32 fpscr;
-
-        fpscr = __FPU_FPSCR;
-
-        if (eflag) {
-                fpscr |= FPSCR_FX;
-                if (eflag & EFLAG_OVERFLOW)
-                        fpscr |= FPSCR_OX;
-                if (eflag & EFLAG_UNDERFLOW)
-                        fpscr |= FPSCR_UX;
-                if (eflag & EFLAG_DIVZERO)
-                        fpscr |= FPSCR_ZX;
-                if (eflag & EFLAG_INEXACT)
-                        fpscr |= FPSCR_XX;
-                if (eflag & EFLAG_VXSNAN)
-                        fpscr |= FPSCR_VXSNAN;
-                if (eflag & EFLAG_VXISI)
-                        fpscr |= FPSCR_VXISI;
-                if (eflag & EFLAG_VXIDI)
-                        fpscr |= FPSCR_VXIDI;
-                if (eflag & EFLAG_VXZDZ)
-                        fpscr |= FPSCR_VXZDZ;
-                if (eflag & EFLAG_VXIMZ)
-                        fpscr |= FPSCR_VXIMZ;
-                if (eflag & EFLAG_VXVC)
-                        fpscr |= FPSCR_VXVC;
-                if (eflag & EFLAG_VXSOFT)
-                        fpscr |= FPSCR_VXSOFT;
-                if (eflag & EFLAG_VXSQRT)
-                        fpscr |= FPSCR_VXSQRT;
-                if (eflag & EFLAG_VXCVI)
-                        fpscr |= FPSCR_VXCVI;
-        }
-
-        fpscr &= ~(FPSCR_VX);
-        if (fpscr & (FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI |
-                     FPSCR_VXZDZ | FPSCR_VXIMZ | FPSCR_VXVC |
-                     FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI))
-                fpscr |= FPSCR_VX;
-
-        fpscr &= ~(FPSCR_FEX);
-        if (((fpscr & FPSCR_VX) && (fpscr & FPSCR_VE)) ||
-            ((fpscr & FPSCR_OX) && (fpscr & FPSCR_OE)) ||
-            ((fpscr & FPSCR_UX) && (fpscr & FPSCR_UE)) ||
-            ((fpscr & FPSCR_ZX) && (fpscr & FPSCR_ZE)) ||
-            ((fpscr & FPSCR_XX) && (fpscr & FPSCR_XE)))
-                fpscr |= FPSCR_FEX;
-
-        __FPU_FPSCR = fpscr;
-
-        return (fpscr & FPSCR_FEX) ? 1 : 0;
-}
-#endif /* CONFIG_MATH_EMULATION */
-
-int
-do_mathemu(struct pt_regs *regs)
-{
-        void *op0 = 0, *op1 = 0, *op2 = 0, *op3 = 0;
-        unsigned long pc = regs->nip;
-        signed short sdisp;
-        u32 insn = 0;
-        int idx = 0;
-#ifdef CONFIG_MATH_EMULATION
-        int (*func)(void *, void *, void *, void *);
-        int type = 0;
-        int eflag, trap;
-#endif
-
-        if (get_user(insn, (u32 *)pc))
-                return -EFAULT;
-
-#ifndef CONFIG_MATH_EMULATION
-        switch (insn >> 26) {
-        case LFD:
-                idx = (insn >> 16) & 0x1f;
-                sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-                lfd(op0, op1, op2, op3);
-                break;
-        case LFDU:
-                idx = (insn >> 16) & 0x1f;
-                sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-                lfd(op0, op1, op2, op3);
-                regs->gpr[idx] = (unsigned long)op1;
-                break;
-        case STFD:
-                idx = (insn >> 16) & 0x1f;
-                sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-                stfd(op0, op1, op2, op3);
-                break;
-        case STFDU:
-                idx = (insn >> 16) & 0x1f;
-                sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-                stfd(op0, op1, op2, op3);
-                regs->gpr[idx] = (unsigned long)op1;
-                break;
-        case OP63:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
-                fmr(op0, op1, op2, op3);
-                break;
-        default:
-                goto illegal;
-        }
-#else /* CONFIG_MATH_EMULATION */
-        switch (insn >> 26) {
-        case LFS:       func = lfs;     type = D;       break;
-        case LFSU:      func = lfs;     type = DU;      break;
-        case LFD:       func = lfd;     type = D;       break;
-        case LFDU:      func = lfd;     type = DU;      break;
-        case STFS:      func = stfs;    type = D;       break;
-        case STFSU:     func = stfs;    type = DU;      break;
-        case STFD:      func = stfd;    type = D;       break;
-        case STFDU:     func = stfd;    type = DU;      break;
-
-        case OP31:
-                switch ((insn >> 1) & 0x3ff) {
-                case LFSX:      func = lfs;     type = XE;      break;
-                case LFSUX:     func = lfs;     type = XEU;     break;
-                case LFDX:      func = lfd;     type = XE;      break;
-                case LFDUX:     func = lfd;     type = XEU;     break;
-                case STFSX:     func = stfs;    type = XE;      break;
-                case STFSUX:    func = stfs;    type = XEU;     break;
-                case STFDX:     func = stfd;    type = XE;      break;
-                case STFDUX:    func = stfd;    type = XEU;     break;
-                case STFIWX:    func = stfiwx;  type = XE;      break;
-                default:
-                        goto illegal;
-                }
-                break;
-
-        case OP59:
-                switch ((insn >> 1) & 0x1f) {
-                case FDIVS:     func = fdivs;   type = AB;      break;
-                case FSUBS:     func = fsubs;   type = AB;      break;
-                case FADDS:     func = fadds;   type = AB;      break;
-                case FSQRTS:    func = fsqrts;  type = AB;      break;
-                case FRES:      func = fres;    type = AB;      break;
-                case FMULS:     func = fmuls;   type = AC;      break;
-                case FMSUBS:    func = fmsubs;  type = ABC;     break;
-                case FMADDS:    func = fmadds;  type = ABC;     break;
-                case FNMSUBS:   func = fnmsubs; type = ABC;     break;
-                case FNMADDS:   func = fnmadds; type = ABC;     break;
-                default:
-                        goto illegal;
-                }
-                break;
-
-        case OP63:
-                if (insn & 0x20) {
-                        switch ((insn >> 1) & 0x1f) {
-                        case FDIV:      func = fdiv;    type = AB;      break;
-                        case FSUB:      func = fsub;    type = AB;      break;
-                        case FADD:      func = fadd;    type = AB;      break;
-                        case FSQRT:     func = fsqrt;   type = AB;      break;
-                        case FSEL:      func = fsel;    type = ABC;     break;
-                        case FMUL:      func = fmul;    type = AC;      break;
-                        case FRSQRTE:   func = frsqrte; type = AB;      break;
-                        case FMSUB:     func = fmsub;   type = ABC;     break;
-                        case FMADD:     func = fmadd;   type = ABC;     break;
-                        case FNMSUB:    func = fnmsub;  type = ABC;     break;
-                        case FNMADD:    func = fnmadd;  type = ABC;     break;
-                        default:
-                                goto illegal;
-                        }
-                        break;
-                }
-
-                switch ((insn >> 1) & 0x3ff) {
-                case FCMPU:     func = fcmpu;   type = XCR;     break;
-                case FRSP:      func = frsp;    type = XB;      break;
-                case FCTIW:     func = fctiw;   type = XB;      break;
-                case FCTIWZ:    func = fctiwz;  type = XB;      break;
-                case FCMPO:     func = fcmpo;   type = XCR;     break;
-                case MTFSB1:    func = mtfsb1;  type = XCRB;    break;
-                case FNEG:      func = fneg;    type = XB;      break;
-                case MCRFS:     func = mcrfs;   type = XCRL;    break;
-                case MTFSB0:    func = mtfsb0;  type = XCRB;    break;
-                case FMR:       func = fmr;     type = XB;      break;
-                case MTFSFI:    func = mtfsfi;  type = XCRI;    break;
-                case FNABS:     func = fnabs;   type = XB;      break;
-                case FABS:      func = fabs;    type = XB;      break;
-                case MFFS:      func = mffs;    type = X;       break;
-                case MTFSF:     func = mtfsf;   type = XFLB;    break;
-                default:
-                        goto illegal;
-                }
-                break;
-
-        default:
-                goto illegal;
-        }
-
-        switch (type) {
-        case AB:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 16) & 0x1f];
-                op2 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
-                break;
-
-        case AC:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 16) & 0x1f];
-                op2 = (void *)&current->thread.fpr[(insn >>  6) & 0x1f];
-                break;
-
-        case ABC:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 16) & 0x1f];
-                op2 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
-                op3 = (void *)&current->thread.fpr[(insn >>  6) & 0x1f];
-                break;
-
-        case D:
-                idx = (insn >> 16) & 0x1f;
-                sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-                break;
-
-        case DU:
-                idx = (insn >> 16) & 0x1f;
-                if (!idx)
-                        goto illegal;
-
-                sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)(regs->gpr[idx] + sdisp);
-                break;
-
-        case X:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                break;
-
-        case XA:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 16) & 0x1f];
-                break;
-
-        case XB:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
-                break;
-
-        case XE:
-                idx = (insn >> 16) & 0x1f;
-                if (!idx)
-                        goto illegal;
-
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >> 11) & 0x1f]);
-                break;
-
-        case XEU:
-                idx = (insn >> 16) & 0x1f;
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)((idx ? regs->gpr[idx] : 0)
-                                + regs->gpr[(insn >> 11) & 0x1f]);
-                break;
-
-        case XCR:
-                op0 = (void *)&regs->ccr;
-                op1 = (void *)((insn >> 23) & 0x7);
-                op2 = (void *)&current->thread.fpr[(insn >> 16) & 0x1f];
-                op3 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
-                break;
-
-        case XCRL:
-                op0 = (void *)&regs->ccr;
-                op1 = (void *)((insn >> 23) & 0x7);
-                op2 = (void *)((insn >> 18) & 0x7);
-                break;
-
-        case XCRB:
-                op0 = (void *)((insn >> 21) & 0x1f);
-                break;
-
-        case XCRI:
-                op0 = (void *)((insn >> 23) & 0x7);
-                op1 = (void *)((insn >> 12) & 0xf);
-                break;
-
-        case XFLB:
-                op0 = (void *)((insn >> 17) & 0xff);
-                op1 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
-                break;
-
-        default:
-                goto illegal;
-        }
-
-        eflag = func(op0, op1, op2, op3);
-
-        if (insn & 1) {
-                regs->ccr &= ~(0x0f000000);
-                regs->ccr |= (__FPU_FPSCR >> 4) & 0x0f000000;
-        }
-
-        trap = record_exception(regs, eflag);
-        if (trap)
-                return 1;
-
-        switch (type) {
-        case DU:
-        case XEU:
-                regs->gpr[idx] = (unsigned long)op1;
-                break;
-
-        default:
-                break;
-        }
-#endif /* CONFIG_MATH_EMULATION */
-
-        regs->nip += 4;
-        return 0;
-
-illegal:
-        return -ENOSYS;
-}
diff --git a/arch/ppc/math-emu/mcrfs.c b/arch/ppc/math-emu/mcrfs.c
deleted file mode 100644
index 106dd912914b..000000000000
--- a/arch/ppc/math-emu/mcrfs.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-
-int
-mcrfs(u32 *ccr, u32 crfD, u32 crfS)
-{
-        u32 value, clear;
-
-#ifdef DEBUG
-        printk("%s: %p (%08x) %d %d\n", __FUNCTION__, ccr, *ccr, crfD, crfS);
-#endif
-
-        clear = 15 << ((7 - crfS) << 2);
-        if (!crfS)
-                clear = 0x90000000;
-
-        value = (__FPU_FPSCR >> ((7 - crfS) << 2)) & 15;
-        __FPU_FPSCR &= ~(clear);
-
-        *ccr &= ~(15 << ((7 - crfD) << 2));
-        *ccr |= (value << ((7 - crfD) << 2));
-
-#ifdef DEBUG
-        printk("CR: %08x\n", __FUNCTION__, *ccr);
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/mffs.c b/arch/ppc/math-emu/mffs.c
deleted file mode 100644
index f477c9170e75..000000000000
--- a/arch/ppc/math-emu/mffs.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-
-int
-mffs(u32 *frD)
-{
-        frD[1] = __FPU_FPSCR;
-
-#ifdef DEBUG
-        printk("%s: frD %p: %08x.%08x\n", __FUNCTION__, frD, frD[0], frD[1]);
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/mtfsb0.c b/arch/ppc/math-emu/mtfsb0.c
deleted file mode 100644
index 99bfd80f4af3..000000000000
--- a/arch/ppc/math-emu/mtfsb0.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-
-int
-mtfsb0(int crbD)
-{
-        if ((crbD != 1) && (crbD != 2))
-                __FPU_FPSCR &= ~(1 << (31 - crbD));
-
-#ifdef DEBUG
-        printk("%s: %d %08lx\n", __FUNCTION__, crbD, __FPU_FPSCR);
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/mtfsb1.c b/arch/ppc/math-emu/mtfsb1.c
deleted file mode 100644
index 3d9e7ed92d2b..000000000000
--- a/arch/ppc/math-emu/mtfsb1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-
-int
-mtfsb1(int crbD)
-{
-        if ((crbD != 1) && (crbD != 2))
-                __FPU_FPSCR |= (1 << (31 - crbD));
-
-#ifdef DEBUG
-        printk("%s: %d %08lx\n", __FUNCTION__, crbD, __FPU_FPSCR);
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/mtfsf.c b/arch/ppc/math-emu/mtfsf.c
deleted file mode 100644
index d70cf714994c..000000000000
--- a/arch/ppc/math-emu/mtfsf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-
-int
-mtfsf(unsigned int FM, u32 *frB)
-{
-        u32 mask;
-
-        if (FM == 0)
-                return 0;
-
-        if (FM == 0xff)
-                mask = 0x9fffffff;
-        else {
-                mask = 0;
-                if (FM & (1 << 0))
-                        mask |= 0x90000000;
-                if (FM & (1 << 1))
-                        mask |= 0x0f000000;
-                if (FM & (1 << 2))
-                        mask |= 0x00f00000;
-                if (FM & (1 << 3))
-                        mask |= 0x000f0000;
-                if (FM & (1 << 4))
-                        mask |= 0x0000f000;
-                if (FM & (1 << 5))
-                        mask |= 0x00000f00;
-                if (FM & (1 << 6))
-                        mask |= 0x000000f0;
-                if (FM & (1 << 7))
-                        mask |= 0x0000000f;
-        }
-
-        __FPU_FPSCR &= ~(mask);
-        __FPU_FPSCR |= (frB[1] & mask);
-
-#ifdef DEBUG
-        printk("%s: %02x %p: %08lx\n", __FUNCTION__, FM, frB, __FPU_FPSCR);
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/mtfsfi.c b/arch/ppc/math-emu/mtfsfi.c
deleted file mode 100644
index 71df854baa7e..000000000000
--- a/arch/ppc/math-emu/mtfsfi.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-
-int
-mtfsfi(unsigned int crfD, unsigned int IMM)
-{
-        u32 mask = 0xf;
-
-        if (!crfD)
-                mask = 9;
-
-        __FPU_FPSCR &= ~(mask << ((7 - crfD) << 2));
-        __FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
-
-#ifdef DEBUG
-        printk("%s: %d %x: %08lx\n", __FUNCTION__, crfD, IMM, __FPU_FPSCR);
-#endif
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/op-1.h b/arch/ppc/math-emu/op-1.h
deleted file mode 100644
index c92fa95f562e..000000000000
--- a/arch/ppc/math-emu/op-1.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Basic one-word fraction declaration and manipulation.
- */
-
-#define _FP_FRAC_DECL_1(X)      _FP_W_TYPE X##_f
-#define _FP_FRAC_COPY_1(D,S)    (D##_f = S##_f)
-#define _FP_FRAC_SET_1(X,I)     (X##_f = I)
-#define _FP_FRAC_HIGH_1(X)      (X##_f)
-#define _FP_FRAC_LOW_1(X)       (X##_f)
-#define _FP_FRAC_WORD_1(X,w)    (X##_f)
-
-#define _FP_FRAC_ADDI_1(X,I)    (X##_f += I)
-#define _FP_FRAC_SLL_1(X,N)                     \
-  do {                                          \
-    if (__builtin_constant_p(N) && (N) == 1)    \
-      X##_f += X##_f;                           \
-    else                                        \
-      X##_f <<= (N);                            \
-  } while (0)
-#define _FP_FRAC_SRL_1(X,N)     (X##_f >>= N)
-
-/* Right shift with sticky-lsb.  */
-#define _FP_FRAC_SRS_1(X,N,sz)  __FP_FRAC_SRS_1(X##_f, N, sz)
-
-#define __FP_FRAC_SRS_1(X,N,sz)                                         \
-   (X = (X >> (N) | (__builtin_constant_p(N) && (N) == 1                \
-                     ? X & 1 : (X << (_FP_W_TYPE_SIZE - (N))) != 0)))
-
-#define _FP_FRAC_ADD_1(R,X,Y)   (R##_f = X##_f + Y##_f)
-#define _FP_FRAC_SUB_1(R,X,Y)   (R##_f = X##_f - Y##_f)
-#define _FP_FRAC_CLZ_1(z, X)    __FP_CLZ(z, X##_f)
-
-/* Predicates */
-#define _FP_FRAC_NEGP_1(X)      ((_FP_WS_TYPE)X##_f < 0)
-#define _FP_FRAC_ZEROP_1(X)     (X##_f == 0)
-#define _FP_FRAC_OVERP_1(fs,X)  (X##_f & _FP_OVERFLOW_##fs)
-#define _FP_FRAC_EQ_1(X, Y)     (X##_f == Y##_f)
-#define _FP_FRAC_GE_1(X, Y)     (X##_f >= Y##_f)
-#define _FP_FRAC_GT_1(X, Y)     (X##_f > Y##_f)
-
-#define _FP_ZEROFRAC_1          0
-#define _FP_MINFRAC_1           1
-
-/*
- * Unpack the raw bits of a native fp value.  Do not classify or
- * normalize the data.
- */
-
-#define _FP_UNPACK_RAW_1(fs, X, val)                            \
-  do {                                                          \
-    union _FP_UNION_##fs _flo; _flo.flt = (val);                \
-                                                                \
-    X##_f = _flo.bits.frac;                                     \
-    X##_e = _flo.bits.exp;                                      \
-    X##_s = _flo.bits.sign;                                     \
-  } while (0)
-
-
-/*
- * Repack the raw bits of a native fp value.
- */
-
-#define _FP_PACK_RAW_1(fs, val, X)                              \
-  do {                                                          \
-    union _FP_UNION_##fs _flo;                                  \
-                                                                \
-    _flo.bits.frac = X##_f;                                     \
-    _flo.bits.exp  = X##_e;                                     \
-    _flo.bits.sign = X##_s;                                     \
-                                                                \
-    (val) = _flo.flt;                                           \
-  } while (0)
-
-
-/*
- * Multiplication algorithms:
- */
-
-/* Basic.  Assuming the host word size is >= 2*FRACBITS, we can do the
-   multiplication immediately.  */
-
-#define _FP_MUL_MEAT_1_imm(fs, R, X, Y)                                 \
-  do {                                                                  \
-    R##_f = X##_f * Y##_f;                                              \
-    /* Normalize since we know where the msb of the multiplicands       \
-       were (bit B), we know that the msb of the of the product is      \
-       at either 2B or 2B-1.  */                                        \
-    _FP_FRAC_SRS_1(R, _FP_WFRACBITS_##fs-1, 2*_FP_WFRACBITS_##fs);      \
-  } while (0)
-
-/* Given a 1W * 1W => 2W primitive, do the extended multiplication.  */
-
-#define _FP_MUL_MEAT_1_wide(fs, R, X, Y, doit)                          \
-  do {                                                                  \
-    _FP_W_TYPE _Z_f0, _Z_f1;                                            \
-    doit(_Z_f1, _Z_f0, X##_f, Y##_f);                                   \
-    /* Normalize since we know where the msb of the multiplicands       \
-       were (bit B), we know that the msb of the of the product is      \
-       at either 2B or 2B-1.  */                                        \
-    _FP_FRAC_SRS_2(_Z, _FP_WFRACBITS_##fs-1, 2*_FP_WFRACBITS_##fs);     \
-    R##_f = _Z_f0;                                                      \
-  } while (0)
-
-/* Finally, a simple widening multiply algorithm.  What fun!  */
-
-#define _FP_MUL_MEAT_1_hard(fs, R, X, Y)                                \
-  do {                                                                  \
-    _FP_W_TYPE _xh, _xl, _yh, _yl, _z_f0, _z_f1, _a_f0, _a_f1;          \
-                                                                        \
-    /* split the words in half */                                       \
-    _xh = X##_f >> (_FP_W_TYPE_SIZE/2);                                 \
-    _xl = X##_f & (((_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE/2)) - 1);         \
-    _yh = Y##_f >> (_FP_W_TYPE_SIZE/2);                                 \
-    _yl = Y##_f & (((_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE/2)) - 1);         \
-                                                                        \
-    /* multiply the pieces */                                           \
-    _z_f0 = _xl * _yl;                                                  \
-    _a_f0 = _xh * _yl;                                                  \
-    _a_f1 = _xl * _yh;                                                  \
-    _z_f1 = _xh * _yh;                                                  \
-                                                                        \
-    /* reassemble into two full words */                                \
-    if ((_a_f0 += _a_f1) < _a_f1)                                       \
-      _z_f1 += (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE/2);                    \
-    _a_f1 = _a_f0 >> (_FP_W_TYPE_SIZE/2);                               \
-    _a_f0 = _a_f0 << (_FP_W_TYPE_SIZE/2);                               \
-    _FP_FRAC_ADD_2(_z, _z, _a);                                         \
-                                                                        \
-    /* normalize */                                                     \
-    _FP_FRAC_SRS_2(_z, _FP_WFRACBITS_##fs - 1, 2*_FP_WFRACBITS_##fs);   \
-    R##_f = _z_f0;                                                      \
-  } while (0)
-
-
-/*
- * Division algorithms:
- */
-
-/* Basic.  Assuming the host word size is >= 2*FRACBITS, we can do the
-   division immediately.  Give this macro either _FP_DIV_HELP_imm for
-   C primitives or _FP_DIV_HELP_ldiv for the ISO function.  Which you
-   choose will depend on what the compiler does with divrem4.  */
-
-#define _FP_DIV_MEAT_1_imm(fs, R, X, Y, doit)           \
-  do {                                                  \
-    _FP_W_TYPE _q, _r;                                  \
-    X##_f <<= (X##_f < Y##_f                            \
-               ? R##_e--, _FP_WFRACBITS_##fs            \
-               : _FP_WFRACBITS_##fs - 1);               \
-    doit(_q, _r, X##_f, Y##_f);                         \
-    R##_f = _q | (_r != 0);                             \
-  } while (0)
-
-/* GCC's longlong.h defines a 2W / 1W => (1W,1W) primitive udiv_qrnnd
-   that may be useful in this situation.  This first is for a primitive
-   that requires normalization, the second for one that does not.  Look
-   for UDIV_NEEDS_NORMALIZATION to tell which your machine needs.  */
-
-#define _FP_DIV_MEAT_1_udiv_norm(fs, R, X, Y)                           \
-  do {                                                                  \
-    _FP_W_TYPE _nh, _nl, _q, _r;                                        \
-                                                                        \
-    /* Normalize Y -- i.e. make the most significant bit set.  */       \
-    Y##_f <<= _FP_WFRACXBITS_##fs - 1;                                  \
-                                                                        \
-    /* Shift X op correspondingly high, that is, up one full word.  */  \
-    if (X##_f <= Y##_f)                                                 \
-      {                                                                 \
-        _nl = 0;                                                        \
-        _nh = X##_f;                                                    \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        R##_e++;                                                        \
-        _nl = X##_f << (_FP_W_TYPE_SIZE-1);                             \
-        _nh = X##_f >> 1;                                               \
-      }                                                                 \
-                                                                        \
-    udiv_qrnnd(_q, _r, _nh, _nl, Y##_f);                                \
-    R##_f = _q | (_r != 0);                                             \
-  } while (0)
-
-#define _FP_DIV_MEAT_1_udiv(fs, R, X, Y)                \
-  do {                                                  \
-    _FP_W_TYPE _nh, _nl, _q, _r;                        \
-    if (X##_f < Y##_f)                                  \
-      {                                                 \
-        R##_e--;                                        \
-        _nl = X##_f << _FP_WFRACBITS_##fs;              \
-        _nh = X##_f >> _FP_WFRACXBITS_##fs;             \
-      }                                                 \
-    else                                                \
-      {                                                 \
-        _nl = X##_f << (_FP_WFRACBITS_##fs - 1);        \
-        _nh = X##_f >> (_FP_WFRACXBITS_##fs + 1);       \
-      }                                                 \
-    udiv_qrnnd(_q, _r, _nh, _nl, Y##_f);                \
-    R##_f = _q | (_r != 0);                             \
-  } while (0)
-
-
-/*
- * Square root algorithms:
- * We have just one right now, maybe Newton approximation
- * should be added for those machines where division is fast.
- */
-
-#define _FP_SQRT_MEAT_1(R, S, T, X, q)                  \
-  do {                                                  \
-    while (q)                                           \
-      {                                                 \
-        T##_f = S##_f + q;                              \
-        if (T##_f <= X##_f)                             \
-          {                                             \
-            S##_f = T##_f + q;                          \
-            X##_f -= T##_f;                             \
-            R##_f += q;                                 \
-          }                                             \
-        _FP_FRAC_SLL_1(X, 1);                           \
-        q >>= 1;                                        \
-      }                                                 \
-  } while (0)
-
-/*
- * Assembly/disassembly for converting to/from integral types.
- * No shifting or overflow handled here.
- */
-
-#define _FP_FRAC_ASSEMBLE_1(r, X, rsize)        (r = X##_f)
-#define _FP_FRAC_DISASSEMBLE_1(X, r, rsize)     (X##_f = r)
-
-
-/*
- * Convert FP values between word sizes
- */
-
-#define _FP_FRAC_CONV_1_1(dfs, sfs, D, S)                               \
-  do {                                                                  \
-    D##_f = S##_f;                                                      \
-    if (_FP_WFRACBITS_##sfs > _FP_WFRACBITS_##dfs)                      \
-      _FP_FRAC_SRS_1(D, (_FP_WFRACBITS_##sfs-_FP_WFRACBITS_##dfs),      \
-                     _FP_WFRACBITS_##sfs);                              \
-    else                                                                \
-      D##_f <<= _FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs;              \
-  } while (0)
diff --git a/arch/ppc/math-emu/op-2.h b/arch/ppc/math-emu/op-2.h
deleted file mode 100644
index b9b06b4c6ea1..000000000000
--- a/arch/ppc/math-emu/op-2.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Basic two-word fraction declaration and manipulation.
- */
-
-#define _FP_FRAC_DECL_2(X)      _FP_W_TYPE X##_f0, X##_f1
-#define _FP_FRAC_COPY_2(D,S)    (D##_f0 = S##_f0, D##_f1 = S##_f1)
-#define _FP_FRAC_SET_2(X,I)     __FP_FRAC_SET_2(X, I)
-#define _FP_FRAC_HIGH_2(X)      (X##_f1)
-#define _FP_FRAC_LOW_2(X)       (X##_f0)
-#define _FP_FRAC_WORD_2(X,w)    (X##_f##w)
-
-#define _FP_FRAC_SLL_2(X,N)                                             \
-  do {                                                                  \
-    if ((N) < _FP_W_TYPE_SIZE)                                          \
-      {                                                                 \
-        if (__builtin_constant_p(N) && (N) == 1)                        \
-          {                                                             \
-            X##_f1 = X##_f1 + X##_f1 + (((_FP_WS_TYPE)(X##_f0)) < 0);   \
-            X##_f0 += X##_f0;                                           \
-          }                                                             \
-        else                                                            \
-          {                                                             \
-            X##_f1 = X##_f1 << (N) | X##_f0 >> (_FP_W_TYPE_SIZE - (N)); \
-            X##_f0 <<= (N);                                             \
-          }                                                             \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        X##_f1 = X##_f0 << ((N) - _FP_W_TYPE_SIZE);                     \
-        X##_f0 = 0;                                                     \
-      }                                                                 \
-  } while (0)
-
-#define _FP_FRAC_SRL_2(X,N)                                             \
-  do {                                                                  \
-    if ((N) < _FP_W_TYPE_SIZE)                                          \
-      {                                                                 \
-        X##_f0 = X##_f0 >> (N) | X##_f1 << (_FP_W_TYPE_SIZE - (N));     \
-        X##_f1 >>= (N);                                                 \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        X##_f0 = X##_f1 >> ((N) - _FP_W_TYPE_SIZE);                     \
-        X##_f1 = 0;                                                     \
-      }                                                                 \
-  } while (0)
-
-/* Right shift with sticky-lsb.  */
-#define _FP_FRAC_SRS_2(X,N,sz)                                          \
-  do {                                                                  \
-    if ((N) < _FP_W_TYPE_SIZE)                                          \
-      {                                                                 \
-        X##_f0 = (X##_f1 << (_FP_W_TYPE_SIZE - (N)) | X##_f0 >> (N) |   \
-                  (__builtin_constant_p(N) && (N) == 1                  \
-                   ? X##_f0 & 1                                         \
-                   : (X##_f0 << (_FP_W_TYPE_SIZE - (N))) != 0));        \
-        X##_f1 >>= (N);                                                 \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        X##_f0 = (X##_f1 >> ((N) - _FP_W_TYPE_SIZE) |                   \
-                  (((X##_f1 << (sz - (N))) | X##_f0) != 0));            \
-        X##_f1 = 0;                                                     \
-      }                                                                 \
-  } while (0)
-
-#define _FP_FRAC_ADDI_2(X,I) \
-  __FP_FRAC_ADDI_2(X##_f1, X##_f0, I)
-
-#define _FP_FRAC_ADD_2(R,X,Y) \
-  __FP_FRAC_ADD_2(R##_f1, R##_f0, X##_f1, X##_f0, Y##_f1, Y##_f0)
-
-#define _FP_FRAC_SUB_2(R,X,Y) \
-  __FP_FRAC_SUB_2(R##_f1, R##_f0, X##_f1, X##_f0, Y##_f1, Y##_f0)
-
-#define _FP_FRAC_CLZ_2(R,X)     \
-  do {                          \
-    if (X##_f1)                 \
-      __FP_CLZ(R,X##_f1);       \
-    else                        \
-    {                           \
-      __FP_CLZ(R,X##_f0);       \
-      R += _FP_W_TYPE_SIZE;     \
-    }                           \
-  } while(0)
-
-/* Predicates */
-#define _FP_FRAC_NEGP_2(X)      ((_FP_WS_TYPE)X##_f1 < 0)
-#define _FP_FRAC_ZEROP_2(X)     ((X##_f1 | X##_f0) == 0)
-#define _FP_FRAC_OVERP_2(fs,X)  (X##_f1 & _FP_OVERFLOW_##fs)
-#define _FP_FRAC_EQ_2(X, Y)     (X##_f1 == Y##_f1 && X##_f0 == Y##_f0)
-#define _FP_FRAC_GT_2(X, Y)     \
-  ((X##_f1 > Y##_f1) || (X##_f1 == Y##_f1 && X##_f0 > Y##_f0))
-#define _FP_FRAC_GE_2(X, Y)     \
-  ((X##_f1 > Y##_f1) || (X##_f1 == Y##_f1 && X##_f0 >= Y##_f0))
-
-#define _FP_ZEROFRAC_2          0, 0
-#define _FP_MINFRAC_2           0, 1
-
-/*
- * Internals
- */
-
-#define __FP_FRAC_SET_2(X,I1,I0)        (X##_f0 = I0, X##_f1 = I1)
-
-#define __FP_CLZ_2(R, xh, xl)   \
-  do {                          \
-    if (xh)                     \
-      __FP_CLZ(R,xl);           \
-    else                        \
-    {                           \
-      __FP_CLZ(R,xl);           \
-      R += _FP_W_TYPE_SIZE;     \
-    }                           \
-  } while(0)
-
-#if 0
-
-#ifndef __FP_FRAC_ADDI_2
-#define __FP_FRAC_ADDI_2(xh, xl, i) \
-  (xh += ((xl += i) < i))
-#endif
-#ifndef __FP_FRAC_ADD_2
-#define __FP_FRAC_ADD_2(rh, rl, xh, xl, yh, yl) \
-  (rh = xh + yh + ((rl = xl + yl) < xl))
-#endif
-#ifndef __FP_FRAC_SUB_2
-#define __FP_FRAC_SUB_2(rh, rl, xh, xl, yh, yl) \
-  (rh = xh - yh - ((rl = xl - yl) > xl))
-#endif
-
-#else
-
-#undef __FP_FRAC_ADDI_2
-#define __FP_FRAC_ADDI_2(xh, xl, i)     add_ssaaaa(xh, xl, xh, xl, 0, i)
-#undef __FP_FRAC_ADD_2
-#define __FP_FRAC_ADD_2                 add_ssaaaa
-#undef __FP_FRAC_SUB_2
-#define __FP_FRAC_SUB_2                 sub_ddmmss
-
-#endif
-
-/*
- * Unpack the raw bits of a native fp value.  Do not classify or
- * normalize the data.
- */
-
-#define _FP_UNPACK_RAW_2(fs, X, val)                    \
-  do {                                                  \
-    union _FP_UNION_##fs _flo; _flo.flt = (val);        \
-                                                        \
-    X##_f0 = _flo.bits.frac0;                           \
-    X##_f1 = _flo.bits.frac1;                           \
-    X##_e  = _flo.bits.exp;                             \
-    X##_s  = _flo.bits.sign;                            \
-  } while (0)
-
-
-/*
- * Repack the raw bits of a native fp value.
- */
-
-#define _FP_PACK_RAW_2(fs, val, X)                      \
-  do {                                                  \
-    union _FP_UNION_##fs _flo;                          \
-                                                        \
-    _flo.bits.frac0 = X##_f0;                           \
-    _flo.bits.frac1 = X##_f1;                           \
-    _flo.bits.exp   = X##_e;                            \
-    _flo.bits.sign  = X##_s;                            \
-                                                        \
-    (val) = _flo.flt;                                   \
-  } while (0)
-
-
-/*
- * Multiplication algorithms:
- */
-
-/* Given a 1W * 1W => 2W primitive, do the extended multiplication.  */
-
-#define _FP_MUL_MEAT_2_wide(fs, R, X, Y, doit)                          \
-  do {                                                                  \
-    _FP_FRAC_DECL_4(_z); _FP_FRAC_DECL_2(_b); _FP_FRAC_DECL_2(_c);      \
-                                                                        \
-    doit(_FP_FRAC_WORD_4(_z,1), _FP_FRAC_WORD_4(_z,0), X##_f0, Y##_f0); \
-    doit(_b_f1, _b_f0, X##_f0, Y##_f1);                                 \
-    doit(_c_f1, _c_f0, X##_f1, Y##_f0);                                 \
-    doit(_FP_FRAC_WORD_4(_z,3), _FP_FRAC_WORD_4(_z,2), X##_f1, Y##_f1); \
-                                                                        \
-    __FP_FRAC_ADD_4(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),        \
-                    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0),        \
-                    0, _b_f1, _b_f0, 0,                                 \
-                    _FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),        \
-                    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0));       \
-    __FP_FRAC_ADD_4(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),        \
-                    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0),        \
-                    0, _c_f1, _c_f0, 0,                                 \
-                    _FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),        \
-                    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0));       \
-                                                                        \
-    /* Normalize since we know where the msb of the multiplicands       \
-       were (bit B), we know that the msb of the of the product is      \
-       at either 2B or 2B-1.  */                                        \
-    _FP_FRAC_SRS_4(_z, _FP_WFRACBITS_##fs-1, 2*_FP_WFRACBITS_##fs);     \
-    R##_f0 = _FP_FRAC_WORD_4(_z,0);                                     \
-    R##_f1 = _FP_FRAC_WORD_4(_z,1);                                     \
-  } while (0)
-
-/* This next macro appears to be totally broken. Fortunately nowhere
- * seems to use it :-> The problem is that we define _z[4] but
- * then use it in _FP_FRAC_SRS_4, which will attempt to access
- * _z_f[n] which will cause an error. The fix probably involves
- * declaring it with _FP_FRAC_DECL_4, see previous macro. -- PMM 02/1998
- */
-#define _FP_MUL_MEAT_2_gmp(fs, R, X, Y)                                 \
-  do {                                                                  \
-    _FP_W_TYPE _x[2], _y[2], _z[4];                                     \
-    _x[0] = X##_f0; _x[1] = X##_f1;                                     \
-    _y[0] = Y##_f0; _y[1] = Y##_f1;                                     \
-                                                                        \
-    mpn_mul_n(_z, _x, _y, 2);                                           \
-                                                                        \
-    /* Normalize since we know where the msb of the multiplicands       \
-       were (bit B), we know that the msb of the of the product is      \
-       at either 2B or 2B-1.  */                                        \
-    _FP_FRAC_SRS_4(_z, _FP_WFRACBITS##_fs-1, 2*_FP_WFRACBITS_##fs);     \
-    R##_f0 = _z[0];                                                     \
-    R##_f1 = _z[1];                                                     \
-  } while (0)
-
-
-/*
- * Division algorithms:
- * This seems to be giving me difficulties -- PMM
- * Look, NetBSD seems to be able to comment algorithms. Can't you?
- * I've thrown printks at the problem.
- * This now appears to work, but I still don't really know why.
- * Also, I don't think the result is properly normalised...
- */
-
-#define _FP_DIV_MEAT_2_udiv_64(fs, R, X, Y)                             \
-  do {                                                                  \
-    extern void _fp_udivmodti4(_FP_W_TYPE q[2], _FP_W_TYPE r[2],        \
-                               _FP_W_TYPE n1, _FP_W_TYPE n0,            \
-                               _FP_W_TYPE d1, _FP_W_TYPE d0);           \
-    _FP_W_TYPE _n_f3, _n_f2, _n_f1, _n_f0, _r_f1, _r_f0;                \
-    _FP_W_TYPE _q_f1, _q_f0, _m_f1, _m_f0;                              \
-    _FP_W_TYPE _rmem[2], _qmem[2];                                      \
-    /* I think this check is to ensure that the result is normalised.   \
-     * Assuming X,Y normalised (ie in [1.0,2.0)) X/Y will be in         \
-     * [0.5,2.0). Furthermore, it will be less than 1.0 iff X < Y.      \
-     * In this case we tweak things. (this is based on comments in      \
-     * the NetBSD FPU emulation code. )                                 \
-     * We know X,Y are normalised because we ensure this as part of     \
-     * the unpacking process. -- PMM                                    \
-     */                                                                 \
-    if (_FP_FRAC_GT_2(X, Y))                                            \
-      {                                                                 \
-/*      R##_e++; */                                                     \
-        _n_f3 = X##_f1 >> 1;                                            \
-        _n_f2 = X##_f1 << (_FP_W_TYPE_SIZE - 1) | X##_f0 >> 1;          \
-        _n_f1 = X##_f0 << (_FP_W_TYPE_SIZE - 1);                        \
-        _n_f0 = 0;                                                      \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        R##_e--;                                                        \
-        _n_f3 = X##_f1;                                                 \
-        _n_f2 = X##_f0;                                                 \
-        _n_f1 = _n_f0 = 0;                                              \
-      }                                                                 \
-                                                                        \
-    /* Normalize, i.e. make the most significant bit of the             \
-       denominator set.  CHANGED: - 1 to nothing -- PMM */              \
-    _FP_FRAC_SLL_2(Y, _FP_WFRACXBITS_##fs /* -1 */);                    \
-                                                                        \
-    /* Do the 256/128 bit division given the 128-bit _fp_udivmodtf4     \
-       primitive snagged from libgcc2.c.  */                            \
-                                                                        \
-    _fp_udivmodti4(_qmem, _rmem, _n_f3, _n_f2, 0, Y##_f1);              \
-    _q_f1 = _qmem[0];                                                   \
-    umul_ppmm(_m_f1, _m_f0, _q_f1, Y##_f0);                             \
-    _r_f1 = _rmem[0];                                                   \
-    _r_f0 = _n_f1;                                                      \
-    if (_FP_FRAC_GT_2(_m, _r))                                          \
-      {                                                                 \
-        _q_f1--;                                                        \
-        _FP_FRAC_ADD_2(_r, _r, Y);                                      \
-        if (_FP_FRAC_GE_2(_r, Y) && _FP_FRAC_GT_2(_m, _r))              \
-          {                                                             \
-            _q_f1--;                                                    \
-            _FP_FRAC_ADD_2(_r, _r, Y);                                  \
-          }                                                             \
-      }                                                                 \
-    _FP_FRAC_SUB_2(_r, _r, _m);                                         \
-                                                                        \
-    _fp_udivmodti4(_qmem, _rmem, _r_f1, _r_f0, 0, Y##_f1);              \
-    _q_f0 = _qmem[0];                                                   \
-    umul_ppmm(_m_f1, _m_f0, _q_f0, Y##_f0);                             \
-    _r_f1 = _rmem[0];                                                   \
-    _r_f0 = _n_f0;                                                      \
-    if (_FP_FRAC_GT_2(_m, _r))                                          \
-      {                                                                 \
-        _q_f0--;                                                        \
-        _FP_FRAC_ADD_2(_r, _r, Y);                                      \
-        if (_FP_FRAC_GE_2(_r, Y) && _FP_FRAC_GT_2(_m, _r))              \
-          {                                                             \
-            _q_f0--;                                                    \
-            _FP_FRAC_ADD_2(_r, _r, Y);                                  \
-          }                                                             \
-      }                                                                 \
-    _FP_FRAC_SUB_2(_r, _r, _m);                                         \
-                                                                        \
-    R##_f1 = _q_f1;                                                     \
-    R##_f0 = _q_f0 | ((_r_f1 | _r_f0) != 0);                            \
-    /* adjust so answer is normalized again. I'm not sure what the      \
-     * final sz param should be. In practice it's never used since      \
-     * N is 1 which is always going to be < _FP_W_TYPE_SIZE...          \
-     */                                                                 \
-    /* _FP_FRAC_SRS_2(R,1,_FP_WFRACBITS_##fs);  */                      \
-  } while (0)
-
-
-#define _FP_DIV_MEAT_2_gmp(fs, R, X, Y)                                 \
-  do {                                                                  \
-    _FP_W_TYPE _x[4], _y[2], _z[4];                                     \
-    _y[0] = Y##_f0; _y[1] = Y##_f1;                                     \
-    _x[0] = _x[3] = 0;                                                  \
-    if (_FP_FRAC_GT_2(X, Y))                                            \
-      {                                                                 \
-        R##_e++;                                                        \
-        _x[1] = (X##_f0 << (_FP_WFRACBITS-1 - _FP_W_TYPE_SIZE) |        \
-                 X##_f1 >> (_FP_W_TYPE_SIZE -                           \
-                            (_FP_WFRACBITS-1 - _FP_W_TYPE_SIZE)));      \
-        _x[2] = X##_f1 << (_FP_WFRACBITS-1 - _FP_W_TYPE_SIZE);          \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        _x[1] = (X##_f0 << (_FP_WFRACBITS - _FP_W_TYPE_SIZE) |          \
-                 X##_f1 >> (_FP_W_TYPE_SIZE -                           \
-                            (_FP_WFRACBITS - _FP_W_TYPE_SIZE)));        \
-        _x[2] = X##_f1 << (_FP_WFRACBITS - _FP_W_TYPE_SIZE);            \
-      }                                                                 \
-                                                                        \
-    (void) mpn_divrem (_z, 0, _x, 4, _y, 2);                            \
-    R##_f1 = _z[1];                                                     \
-    R##_f0 = _z[0] | ((_x[0] | _x[1]) != 0);                            \
-  } while (0)
-
-
-/*
- * Square root algorithms:
- * We have just one right now, maybe Newton approximation
- * should be added for those machines where division is fast.
- */
-
-#define _FP_SQRT_MEAT_2(R, S, T, X, q)                  \
-  do {                                                  \
-    while (q)                                           \
-      {                                                 \
-        T##_f1 = S##_f1 + q;                            \
-        if (T##_f1 <= X##_f1)                           \
-          {                                             \
-            S##_f1 = T##_f1 + q;                        \
-            X##_f1 -= T##_f1;                           \
-            R##_f1 += q;                                \
-          }                                             \
-        _FP_FRAC_SLL_2(X, 1);                           \
-        q >>= 1;                                        \
-      }                                                 \
-    q = (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE - 1);         \
-    while (q)                                           \
-      {                                                 \
-        T##_f0 = S##_f0 + q;                            \
-        T##_f1 = S##_f1;                                \
-        if (T##_f1 < X##_f1 ||                          \
-            (T##_f1 == X##_f1 && T##_f0 < X##_f0))      \
-          {                                             \
-            S##_f0 = T##_f0 + q;                        \
-            if (((_FP_WS_TYPE)T##_f0) < 0 &&            \
-                ((_FP_WS_TYPE)S##_f0) >= 0)             \
-              S##_f1++;                                 \
-            _FP_FRAC_SUB_2(X, X, T);                    \
-            R##_f0 += q;                                \
-          }                                             \
-        _FP_FRAC_SLL_2(X, 1);                           \
-        q >>= 1;                                        \
-      }                                                 \
-  } while (0)
-
-
-/*
- * Assembly/disassembly for converting to/from integral types.
- * No shifting or overflow handled here.
- */
-
-#define _FP_FRAC_ASSEMBLE_2(r, X, rsize)        \
-  do {                                          \
-    if (rsize <= _FP_W_TYPE_SIZE)               \
-      r = X##_f0;                               \
-    else                                        \
-      {                                         \
-        r = X##_f1;                             \
-        r <<= _FP_W_TYPE_SIZE;                  \
-        r += X##_f0;                            \
-      }                                         \
-  } while (0)
-
-#define _FP_FRAC_DISASSEMBLE_2(X, r, rsize)                             \
-  do {                                                                  \
-    X##_f0 = r;                                                         \
-    X##_f1 = (rsize <= _FP_W_TYPE_SIZE ? 0 : r >> _FP_W_TYPE_SIZE);     \
-  } while (0)
-
-/*
- * Convert FP values between word sizes
- */
-
-#define _FP_FRAC_CONV_1_2(dfs, sfs, D, S)                               \
-  do {                                                                  \
-    _FP_FRAC_SRS_2(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs),      \
-                   _FP_WFRACBITS_##sfs);                                \
-    D##_f = S##_f0;                                                     \
-  } while (0)
-
-#define _FP_FRAC_CONV_2_1(dfs, sfs, D, S)                               \
-  do {                                                                  \
-    D##_f0 = S##_f;                                                     \
-    D##_f1 = 0;                                                         \
-    _FP_FRAC_SLL_2(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs));     \
-  } while (0)
-
diff --git a/arch/ppc/math-emu/op-4.h b/arch/ppc/math-emu/op-4.h
deleted file mode 100644
index fcdd6d064c54..000000000000
--- a/arch/ppc/math-emu/op-4.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Basic four-word fraction declaration and manipulation.
- *
- * When adding quadword support for 32 bit machines, we need
- * to be a little careful as double multiply uses some of these
- * macros: (in op-2.h)
- * _FP_MUL_MEAT_2_wide() uses _FP_FRAC_DECL_4, _FP_FRAC_WORD_4,
- * _FP_FRAC_ADD_4, _FP_FRAC_SRS_4
- * _FP_MUL_MEAT_2_gmp() uses _FP_FRAC_SRS_4 (and should use
- * _FP_FRAC_DECL_4: it appears to be broken and is not used
- * anywhere anyway. )
- *
- * I've now fixed all the macros that were here from the sparc64 code.
- * [*none* of the shift macros were correct!] -- PMM 02/1998
- *
- * The only quadword stuff that remains to be coded is:
- * 1) the conversion to/from ints, which requires
- * that we check (in op-common.h) that the following do the right thing
- * for quadwords: _FP_TO_INT(Q,4,r,X,rsz,rsg), _FP_FROM_INT(Q,4,X,r,rs,rt)
- * 2) multiply, divide and sqrt, which require:
- * _FP_MUL_MEAT_4_*(R,X,Y), _FP_DIV_MEAT_4_*(R,X,Y), _FP_SQRT_MEAT_4(R,S,T,X,q),
- * This also needs _FP_MUL_MEAT_Q and _FP_DIV_MEAT_Q to be defined to
- * some suitable _FP_MUL_MEAT_4_* macros in sfp-machine.h.
- * [we're free to choose whatever FP_MUL_MEAT_4_* macros we need for
- * these; they are used nowhere else. ]
- */
-
-#define _FP_FRAC_DECL_4(X)      _FP_W_TYPE X##_f[4]
-#define _FP_FRAC_COPY_4(D,S)                    \
-  (D##_f[0] = S##_f[0], D##_f[1] = S##_f[1],    \
-   D##_f[2] = S##_f[2], D##_f[3] = S##_f[3])
-/* The _FP_FRAC_SET_n(X,I) macro is intended for use with another
- * macro such as _FP_ZEROFRAC_n which returns n comma separated values.
- * The result is that we get an expansion of __FP_FRAC_SET_n(X,I0,I1,I2,I3)
- * which just assigns the In values to the array X##_f[].
- * This is why the number of parameters doesn't appear to match
- * at first glance...      -- PMM
- */
-#define _FP_FRAC_SET_4(X,I)     __FP_FRAC_SET_4(X, I)
-#define _FP_FRAC_HIGH_4(X)      (X##_f[3])
-#define _FP_FRAC_LOW_4(X)       (X##_f[0])
-#define _FP_FRAC_WORD_4(X,w)    (X##_f[w])
-
-#define _FP_FRAC_SLL_4(X,N)                                             \
-  do {                                                                  \
-    _FP_I_TYPE _up, _down, _skip, _i;                                   \
-    _skip = (N) / _FP_W_TYPE_SIZE;                                      \
-    _up = (N) % _FP_W_TYPE_SIZE;                                        \
-    _down = _FP_W_TYPE_SIZE - _up;                                      \
-    for (_i = 3; _i > _skip; --_i)                                      \
-      X##_f[_i] = X##_f[_i-_skip] << _up | X##_f[_i-_skip-1] >> _down;  \
-/* bugfixed: was X##_f[_i] <<= _up;  -- PMM 02/1998 */                  \
-    X##_f[_i] = X##_f[0] << _up;                                        \
-    for (--_i; _i >= 0; --_i)                                           \
-      X##_f[_i] = 0;                                                    \
-  } while (0)
-
-/* This one was broken too */
-#define _FP_FRAC_SRL_4(X,N)                                             \
-  do {                                                                  \
-    _FP_I_TYPE _up, _down, _skip, _i;                                   \
-    _skip = (N) / _FP_W_TYPE_SIZE;                                      \
-    _down = (N) % _FP_W_TYPE_SIZE;                                      \
-    _up = _FP_W_TYPE_SIZE - _down;                                      \
-    for (_i = 0; _i < 3-_skip; ++_i)                                    \
-      X##_f[_i] = X##_f[_i+_skip] >> _down | X##_f[_i+_skip+1] << _up;  \
-    X##_f[_i] = X##_f[3] >> _down;                                      \
-    for (++_i; _i < 4; ++_i)                                            \
-      X##_f[_i] = 0;                                                    \
-  } while (0)
-
-
-/* Right shift with sticky-lsb.
- * What this actually means is that we do a standard right-shift,
- * but that if any of the bits that fall off the right hand side
- * were one then we always set the LSbit.
- */
-#define _FP_FRAC_SRS_4(X,N,size)                                        \
-  do {                                                                  \
-    _FP_I_TYPE _up, _down, _skip, _i;                                   \
-    _FP_W_TYPE _s;                                                      \
-    _skip = (N) / _FP_W_TYPE_SIZE;                                      \
-    _down = (N) % _FP_W_TYPE_SIZE;                                      \
-    _up = _FP_W_TYPE_SIZE - _down;                                      \
-    for (_s = _i = 0; _i < _skip; ++_i)                                 \
-      _s |= X##_f[_i];                                                  \
-    _s |= X##_f[_i] << _up;                                             \
-/* s is now != 0 if we want to set the LSbit */                         \
-    for (_i = 0; _i < 3-_skip; ++_i)                                    \
-      X##_f[_i] = X##_f[_i+_skip] >> _down | X##_f[_i+_skip+1] << _up;  \
-    X##_f[_i] = X##_f[3] >> _down;                                      \
-    for (++_i; _i < 4; ++_i)                                            \
-      X##_f[_i] = 0;                                                    \
-    /* don't fix the LSB until the very end when we're sure f[0] is stable */ \
-    X##_f[0] |= (_s != 0);                                              \
-  } while (0)
-
-#define _FP_FRAC_ADD_4(R,X,Y)                                           \
-  __FP_FRAC_ADD_4(R##_f[3], R##_f[2], R##_f[1], R##_f[0],               \
-                  X##_f[3], X##_f[2], X##_f[1], X##_f[0],               \
-                  Y##_f[3], Y##_f[2], Y##_f[1], Y##_f[0])
-
-#define _FP_FRAC_SUB_4(R,X,Y)                                           \
-  __FP_FRAC_SUB_4(R##_f[3], R##_f[2], R##_f[1], R##_f[0],               \
-                  X##_f[3], X##_f[2], X##_f[1], X##_f[0],               \
-                  Y##_f[3], Y##_f[2], Y##_f[1], Y##_f[0])
-
-#define _FP_FRAC_ADDI_4(X,I)                                            \
-  __FP_FRAC_ADDI_4(X##_f[3], X##_f[2], X##_f[1], X##_f[0], I)
-
-#define _FP_ZEROFRAC_4  0,0,0,0
-#define _FP_MINFRAC_4   0,0,0,1
-
-#define _FP_FRAC_ZEROP_4(X)     ((X##_f[0] | X##_f[1] | X##_f[2] | X##_f[3]) == 0)
-#define _FP_FRAC_NEGP_4(X)      ((_FP_WS_TYPE)X##_f[3] < 0)
-#define _FP_FRAC_OVERP_4(fs,X)  (X##_f[0] & _FP_OVERFLOW_##fs)
-
-#define _FP_FRAC_EQ_4(X,Y)                              \
- (X##_f[0] == Y##_f[0] && X##_f[1] == Y##_f[1]          \
-  && X##_f[2] == Y##_f[2] && X##_f[3] == Y##_f[3])
-
-#define _FP_FRAC_GT_4(X,Y)                              \
- (X##_f[3] > Y##_f[3] ||                                \
-  (X##_f[3] == Y##_f[3] && (X##_f[2] > Y##_f[2] ||      \
-   (X##_f[2] == Y##_f[2] && (X##_f[1] > Y##_f[1] ||     \
-    (X##_f[1] == Y##_f[1] && X##_f[0] > Y##_f[0])       \
-   ))                                                   \
-  ))                                                    \
- )
-
-#define _FP_FRAC_GE_4(X,Y)                              \
- (X##_f[3] > Y##_f[3] ||                                \
-  (X##_f[3] == Y##_f[3] && (X##_f[2] > Y##_f[2] ||      \
-   (X##_f[2] == Y##_f[2] && (X##_f[1] > Y##_f[1] ||     \
-    (X##_f[1] == Y##_f[1] && X##_f[0] >= Y##_f[0])      \
-   ))                                                   \
-  ))                                                    \
- )
-
-
-#define _FP_FRAC_CLZ_4(R,X)             \
-  do {                                  \
-    if (X##_f[3])                       \
-    {                                   \
-        __FP_CLZ(R,X##_f[3]);           \
-    }                                   \
-    else if (X##_f[2])                  \
-    {                                   \
-        __FP_CLZ(R,X##_f[2]);           \
-        R += _FP_W_TYPE_SIZE;           \
-    }                                   \
-    else if (X##_f[1])                  \
-    {                                   \
-        __FP_CLZ(R,X##_f[2]);           \
-        R += _FP_W_TYPE_SIZE*2;         \
-    }                                   \
-    else                                \
-    {                                   \
-        __FP_CLZ(R,X##_f[0]);           \
-        R += _FP_W_TYPE_SIZE*3;         \
-    }                                   \
-  } while(0)
-
-
-#define _FP_UNPACK_RAW_4(fs, X, val)                            \
-  do {                                                          \
-    union _FP_UNION_##fs _flo; _flo.flt = (val);                \
-    X##_f[0] = _flo.bits.frac0;                                 \
-    X##_f[1] = _flo.bits.frac1;                                 \
-    X##_f[2] = _flo.bits.frac2;                                 \
-    X##_f[3] = _flo.bits.frac3;                                 \
-    X##_e  = _flo.bits.exp;                                     \
-    X##_s  = _flo.bits.sign;                                    \
-  } while (0)
-
-#define _FP_PACK_RAW_4(fs, val, X)                              \
-  do {                                                          \
-    union _FP_UNION_##fs _flo;                                  \
-    _flo.bits.frac0 = X##_f[0];                                 \
-    _flo.bits.frac1 = X##_f[1];                                 \
-    _flo.bits.frac2 = X##_f[2];                                 \
-    _flo.bits.frac3 = X##_f[3];                                 \
-    _flo.bits.exp   = X##_e;                                    \
-    _flo.bits.sign  = X##_s;                                    \
-    (val) = _flo.flt;                                           \
-  } while (0)
-
-
-/*
- * Internals
- */
-
-#define __FP_FRAC_SET_4(X,I3,I2,I1,I0)                                  \
-  (X##_f[3] = I3, X##_f[2] = I2, X##_f[1] = I1, X##_f[0] = I0)
-
-#ifndef __FP_FRAC_ADD_4
-#define __FP_FRAC_ADD_4(r3,r2,r1,r0,x3,x2,x1,x0,y3,y2,y1,y0)            \
-  (r0 = x0 + y0,                                                        \
-   r1 = x1 + y1 + (r0 < x0),                                            \
-   r2 = x2 + y2 + (r1 < x1),                                            \
-   r3 = x3 + y3 + (r2 < x2))
-#endif
-
-#ifndef __FP_FRAC_SUB_4
-#define __FP_FRAC_SUB_4(r3,r2,r1,r0,x3,x2,x1,x0,y3,y2,y1,y0)            \
-  (r0 = x0 - y0,                                                        \
-   r1 = x1 - y1 - (r0 > x0),                                            \
-   r2 = x2 - y2 - (r1 > x1),                                            \
-   r3 = x3 - y3 - (r2 > x2))
-#endif
-
-#ifndef __FP_FRAC_ADDI_4
-/* I always wanted to be a lisp programmer :-> */
-#define __FP_FRAC_ADDI_4(x3,x2,x1,x0,i)                                 \
-  (x3 += ((x2 += ((x1 += ((x0 += i) < x0)) < x1) < x2)))
-#endif
-
-/* Convert FP values between word sizes. This appears to be more
- * complicated than I'd have expected it to be, so these might be
- * wrong... These macros are in any case somewhat bogus because they
- * use information about what various FRAC_n variables look like
- * internally [eg, that 2 word vars are X_f0 and x_f1]. But so do
- * the ones in op-2.h and op-1.h.
- */
-#define _FP_FRAC_CONV_1_4(dfs, sfs, D, S)                               \
-   do {                                                                 \
-     _FP_FRAC_SRS_4(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs),     \
-                        _FP_WFRACBITS_##sfs);                           \
-     D##_f = S##_f[0];                                                   \
-  } while (0)
-
-#define _FP_FRAC_CONV_2_4(dfs, sfs, D, S)                               \
-   do {                                                                 \
-     _FP_FRAC_SRS_4(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs),     \
-                        _FP_WFRACBITS_##sfs);                           \
-     D##_f0 = S##_f[0];                                                  \
-     D##_f1 = S##_f[1];                                                  \
-  } while (0)
-
-/* Assembly/disassembly for converting to/from integral types.
- * No shifting or overflow handled here.
- */
-/* Put the FP value X into r, which is an integer of size rsize. */
-#define _FP_FRAC_ASSEMBLE_4(r, X, rsize)                                \
-  do {                                                                  \
-    if (rsize <= _FP_W_TYPE_SIZE)                                       \
-      r = X##_f[0];                                                     \
-    else if (rsize <= 2*_FP_W_TYPE_SIZE)                                \
-    {                                                                   \
-      r = X##_f[1];                                                     \
-      r <<= _FP_W_TYPE_SIZE;                                            \
-      r += X##_f[0];                                                    \
-    }                                                                   \
-    else                                                                \
-    {                                                                   \
-      /* I'm feeling lazy so we deal with int == 3words (implausible)*/ \
-      /* and int == 4words as a single case.                         */ \
-      r = X##_f[3];                                                     \
-      r <<= _FP_W_TYPE_SIZE;                                            \
-      r += X##_f[2];                                                    \
-      r <<= _FP_W_TYPE_SIZE;                                            \
-      r += X##_f[1];                                                    \
-      r <<= _FP_W_TYPE_SIZE;                                            \
-      r += X##_f[0];                                                    \
-    }                                                                   \
-  } while (0)
-
-/* "No disassemble Number Five!" */
-/* move an integer of size rsize into X's fractional part. We rely on
- * the _f[] array consisting of words of size _FP_W_TYPE_SIZE to avoid
- * having to mask the values we store into it.
- */
-#define _FP_FRAC_DISASSEMBLE_4(X, r, rsize)                             \
-  do {                                                                  \
-    X##_f[0] = r;                                                       \
-    X##_f[1] = (rsize <= _FP_W_TYPE_SIZE ? 0 : r >> _FP_W_TYPE_SIZE);   \
-    X##_f[2] = (rsize <= 2*_FP_W_TYPE_SIZE ? 0 : r >> 2*_FP_W_TYPE_SIZE); \
-    X##_f[3] = (rsize <= 3*_FP_W_TYPE_SIZE ? 0 : r >> 3*_FP_W_TYPE_SIZE); \
-  } while (0)
-
-#define _FP_FRAC_CONV_4_1(dfs, sfs, D, S)                               \
-   do {                                                                 \
-     D##_f[0] = S##_f;                                                  \
-     D##_f[1] = D##_f[2] = D##_f[3] = 0;                                \
-     _FP_FRAC_SLL_4(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs));    \
-   } while (0)
-
-#define _FP_FRAC_CONV_4_2(dfs, sfs, D, S)                               \
-   do {                                                                 \
-     D##_f[0] = S##_f0;                                                 \
-     D##_f[1] = S##_f1;                                                 \
-     D##_f[2] = D##_f[3] = 0;                                           \
-     _FP_FRAC_SLL_4(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs));    \
-   } while (0)
-
-/* FIXME! This has to be written */
-#define _FP_SQRT_MEAT_4(R, S, T, X, q)
diff --git a/arch/ppc/math-emu/op-common.h b/arch/ppc/math-emu/op-common.h
deleted file mode 100644
index afb82b6498ce..000000000000
--- a/arch/ppc/math-emu/op-common.h
+++ /dev/null
@@ -1,688 +0,0 @@
-#define _FP_DECL(wc, X)                 \
-  _FP_I_TYPE X##_c, X##_s, X##_e;       \
-  _FP_FRAC_DECL_##wc(X)
-
-/*
- * Finish truely unpacking a native fp value by classifying the kind
- * of fp value and normalizing both the exponent and the fraction.
- */
-
-#define _FP_UNPACK_CANONICAL(fs, wc, X)                                 \
-do {                                                                    \
-  switch (X##_e)                                                        \
-  {                                                                     \
-  default:                                                              \
-    _FP_FRAC_HIGH_##wc(X) |= _FP_IMPLBIT_##fs;                          \
-    _FP_FRAC_SLL_##wc(X, _FP_WORKBITS);                                 \
-    X##_e -= _FP_EXPBIAS_##fs;                                          \
-    X##_c = FP_CLS_NORMAL;                                              \
-    break;                                                              \
-                                                                        \
-  case 0:                                                               \
-    if (_FP_FRAC_ZEROP_##wc(X))                                         \
-      X##_c = FP_CLS_ZERO;                                              \
-    else                                                                \
-      {                                                                 \
-        /* a denormalized number */                                     \
-        _FP_I_TYPE _shift;                                              \
-        _FP_FRAC_CLZ_##wc(_shift, X);                                   \
-        _shift -= _FP_FRACXBITS_##fs;                                   \
-        _FP_FRAC_SLL_##wc(X, (_shift+_FP_WORKBITS));                    \
-        X##_e -= _FP_EXPBIAS_##fs - 1 + _shift;                         \
-        X##_c = FP_CLS_NORMAL;                                          \
-      }                                                                 \
-    break;                                                              \
-                                                                        \
-  case _FP_EXPMAX_##fs:                                                 \
-    if (_FP_FRAC_ZEROP_##wc(X))                                         \
-      X##_c = FP_CLS_INF;                                               \
-    else                                                                \
-      /* we don't differentiate between signaling and quiet nans */     \
-      X##_c = FP_CLS_NAN;                                               \
-    break;                                                              \
-  }                                                                     \
-} while (0)
-
-
-/*
- * Before packing the bits back into the native fp result, take care
- * of such mundane things as rounding and overflow.  Also, for some
- * kinds of fp values, the original parts may not have been fully
- * extracted -- but that is ok, we can regenerate them now.
- */
-
-#define _FP_PACK_CANONICAL(fs, wc, X)                           \
-({int __ret = 0;                                                \
-  switch (X##_c)                                                \
-  {                                                             \
-  case FP_CLS_NORMAL:                                           \
-    X##_e += _FP_EXPBIAS_##fs;                                  \
-    if (X##_e > 0)                                              \
-      {                                                         \
-        __ret |= _FP_ROUND(wc, X);                              \
-        if (_FP_FRAC_OVERP_##wc(fs, X))                         \
-          {                                                     \
-            _FP_FRAC_SRL_##wc(X, (_FP_WORKBITS+1));             \
-            X##_e++;                                            \
-          }                                                     \
-        else                                                    \
-          _FP_FRAC_SRL_##wc(X, _FP_WORKBITS);                   \
-        if (X##_e >= _FP_EXPMAX_##fs)                           \
-          {                                                     \
-            /* overflow to infinity */                          \
-            X##_e = _FP_EXPMAX_##fs;                            \
-            _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);            \
-            __ret |= EFLAG_OVERFLOW;                            \
-          }                                                     \
-      }                                                         \
-    else                                                        \
-      {                                                         \
-        /* we've got a denormalized number */                   \
-        X##_e = -X##_e + 1;                                     \
-        if (X##_e <= _FP_WFRACBITS_##fs)                        \
-          {                                                     \
-            _FP_FRAC_SRS_##wc(X, X##_e, _FP_WFRACBITS_##fs);    \
-            _FP_FRAC_SLL_##wc(X, 1);                            \
-            if (_FP_FRAC_OVERP_##wc(fs, X))                     \
-              {                                                 \
-                X##_e = 1;                                      \
-                _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);        \
-              }                                                 \
-            else                                                \
-              {                                                 \
-                X##_e = 0;                                      \
-                _FP_FRAC_SRL_##wc(X, _FP_WORKBITS+1);           \
-                __ret |= EFLAG_UNDERFLOW;                       \
-              }                                                 \
-          }                                                     \
-        else                                                    \
-          {                                                     \
-            /* underflow to zero */                             \
-            X##_e = 0;                                          \
-            _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);            \
-            __ret |= EFLAG_UNDERFLOW;                           \
-          }                                                     \
-      }                                                         \
-    break;                                                      \
-                                                                \
-  case FP_CLS_ZERO:                                             \
-    X##_e = 0;                                                  \
-    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);                    \
-    break;                                                      \
-                                                                \
-  case FP_CLS_INF:                                              \
-    X##_e = _FP_EXPMAX_##fs;                                    \
-    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);                    \
-    break;                                                      \
-                                                                \
-  case FP_CLS_NAN:                                              \
-    X##_e = _FP_EXPMAX_##fs;                                    \
-    if (!_FP_KEEPNANFRACP)                                      \
-      {                                                         \
-        _FP_FRAC_SET_##wc(X, _FP_NANFRAC_##fs);                 \
-        X##_s = 0;                                              \
-      }                                                         \
-    else                                                        \
-      _FP_FRAC_HIGH_##wc(X) |= _FP_QNANBIT_##fs;                \
-    break;                                                      \
-  }                                                             \
-  __ret;                                                        \
-})
-
-
-/*
- * Main addition routine.  The input values should be cooked.
- */
-
-#define _FP_ADD(fs, wc, R, X, Y)                                             \
-do {                                                                         \
-  switch (_FP_CLS_COMBINE(X##_c, Y##_c))                                     \
-  {                                                                          \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):                         \
-    {                                                                        \
-      /* shift the smaller number so that its exponent matches the larger */ \
-      _FP_I_TYPE diff = X##_e - Y##_e;                                       \
-                                                                             \
-      if (diff < 0)                                                          \
-        {                                                                    \
-          diff = -diff;                                                      \
-          if (diff <= _FP_WFRACBITS_##fs)                                    \
-            _FP_FRAC_SRS_##wc(X, diff, _FP_WFRACBITS_##fs);                  \
-          else if (!_FP_FRAC_ZEROP_##wc(X))                                  \
-            _FP_FRAC_SET_##wc(X, _FP_MINFRAC_##wc);                          \
-          else                                                               \
-            _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);                         \
-          R##_e = Y##_e;                                                     \
-        }                                                                    \
-      else                                                                   \
-        {                                                                    \
-          if (diff > 0)                                                      \
-            {                                                                \
-              if (diff <= _FP_WFRACBITS_##fs)                                \
-                _FP_FRAC_SRS_##wc(Y, diff, _FP_WFRACBITS_##fs);              \
-              else if (!_FP_FRAC_ZEROP_##wc(Y))                              \
-                _FP_FRAC_SET_##wc(Y, _FP_MINFRAC_##wc);                      \
-              else                                                           \
-                _FP_FRAC_SET_##wc(Y, _FP_ZEROFRAC_##wc);                     \
-            }                                                                \
-          R##_e = X##_e;                                                     \
-        }                                                                    \
-                                                                             \
-      R##_c = FP_CLS_NORMAL;                                                 \
-                                                                             \
-      if (X##_s == Y##_s)                                                    \
-        {                                                                    \
-          R##_s = X##_s;                                                     \
-          _FP_FRAC_ADD_##wc(R, X, Y);                                        \
-          if (_FP_FRAC_OVERP_##wc(fs, R))                                    \
-            {                                                                \
-              _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs);                   \
-              R##_e++;                                                       \
-            }                                                                \
-        }                                                                    \
-      else                                                                   \
-        {                                                                    \
-          R##_s = X##_s;                                                     \
-          _FP_FRAC_SUB_##wc(R, X, Y);                                        \
-          if (_FP_FRAC_ZEROP_##wc(R))                                        \
-            {                                                                \
-              /* return an exact zero */                                     \
-              if (FP_ROUNDMODE == FP_RND_MINF)                               \
-                R##_s |= Y##_s;                                              \
-              else                                                           \
-                R##_s &= Y##_s;                                              \
-              R##_c = FP_CLS_ZERO;                                           \
-            }                                                                \
-          else                                                               \
-            {                                                                \
-              if (_FP_FRAC_NEGP_##wc(R))                                     \
-                {                                                            \
-                  _FP_FRAC_SUB_##wc(R, Y, X);                                \
-                  R##_s = Y##_s;                                             \
-                }                                                            \
-                                                                             \
-              /* renormalize after subtraction */                            \
-              _FP_FRAC_CLZ_##wc(diff, R);                                    \
-              diff -= _FP_WFRACXBITS_##fs;                                   \
-              if (diff)                                                      \
-                {                                                            \
-                  R##_e -= diff;                                             \
-                  _FP_FRAC_SLL_##wc(R, diff);                                \
-                }                                                            \
-            }                                                                \
-        }                                                                    \
-      break;                                                                 \
-    }                                                                        \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):                               \
-    _FP_CHOOSENAN(fs, wc, R, X, Y);                                          \
-    break;                                                                   \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):                           \
-    R##_e = X##_e;                                                           \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):                            \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):                               \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):                              \
-    _FP_FRAC_COPY_##wc(R, X);                                                \
-    R##_s = X##_s;                                                           \
-    R##_c = X##_c;                                                           \
-    break;                                                                   \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):                           \
-    R##_e = Y##_e;                                                           \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):                            \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):                               \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):                              \
-    _FP_FRAC_COPY_##wc(R, Y);                                                \
-    R##_s = Y##_s;                                                           \
-    R##_c = Y##_c;                                                           \
-    break;                                                                   \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):                               \
-    if (X##_s != Y##_s)                                                      \
-      {                                                                      \
-        /* +INF + -INF => NAN */                                             \
-        _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);                              \
-        R##_s = X##_s ^ Y##_s;                                               \
-        R##_c = FP_CLS_NAN;                                                  \
-        break;                                                               \
-      }                                                                      \
-    /* FALLTHRU */                                                           \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):                            \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):                              \
-    R##_s = X##_s;                                                           \
-    R##_c = FP_CLS_INF;                                                      \
-    break;                                                                   \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):                            \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):                              \
-    R##_s = Y##_s;                                                           \
-    R##_c = FP_CLS_INF;                                                      \
-    break;                                                                   \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):                             \
-    /* make sure the sign is correct */                                      \
-    if (FP_ROUNDMODE == FP_RND_MINF)                                         \
-      R##_s = X##_s | Y##_s;                                                 \
-    else                                                                     \
-      R##_s = X##_s & Y##_s;                                                 \
-    R##_c = FP_CLS_ZERO;                                                     \
-    break;                                                                   \
-                                                                             \
-  default:                                                                   \
-    abort();                                                                 \
-  }                                                                          \
-} while (0)
-
-
-/*
- * Main negation routine.  FIXME -- when we care about setting exception
- * bits reliably, this will not do.  We should examine all of the fp classes.
- */
-
-#define _FP_NEG(fs, wc, R, X)           \
-  do {                                  \
-    _FP_FRAC_COPY_##wc(R, X);           \
-    R##_c = X##_c;                      \
-    R##_e = X##_e;                      \
-    R##_s = 1 ^ X##_s;                  \
-  } while (0)
-
-
-/*
- * Main multiplication routine.  The input values should be cooked.
- */
-
-#define _FP_MUL(fs, wc, R, X, Y)                        \
-do {                                                    \
-  R##_s = X##_s ^ Y##_s;                                \
-  switch (_FP_CLS_COMBINE(X##_c, Y##_c))                \
-  {                                                     \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):    \
-    R##_c = FP_CLS_NORMAL;                              \
-    R##_e = X##_e + Y##_e + 1;                          \
-                                                        \
-    _FP_MUL_MEAT_##fs(R,X,Y);                           \
-                                                        \
-    if (_FP_FRAC_OVERP_##wc(fs, R))                     \
-      _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs);      \
-    else                                                \
-      R##_e--;                                          \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):          \
-    _FP_CHOOSENAN(fs, wc, R, X, Y);                     \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):       \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):          \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):         \
-    R##_s = X##_s;                                      \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):          \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):       \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):      \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):        \
-    _FP_FRAC_COPY_##wc(R, X);                           \
-    R##_c = X##_c;                                      \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):       \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):          \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):         \
-    R##_s = Y##_s;                                      \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):       \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):      \
-    _FP_FRAC_COPY_##wc(R, Y);                           \
-    R##_c = Y##_c;                                      \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):         \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):         \
-    R##_c = FP_CLS_NAN;                                 \
-    _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);             \
-    break;                                              \
-                                                        \
-  default:                                              \
-    abort();                                            \
-  }                                                     \
-} while (0)
-
-
-/*
- * Main division routine.  The input values should be cooked.
- */
-
-#define _FP_DIV(fs, wc, R, X, Y)                        \
-do {                                                    \
-  R##_s = X##_s ^ Y##_s;                                \
-  switch (_FP_CLS_COMBINE(X##_c, Y##_c))                \
-  {                                                     \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):    \
-    R##_c = FP_CLS_NORMAL;                              \
-    R##_e = X##_e - Y##_e;                              \
-                                                        \
-    _FP_DIV_MEAT_##fs(R,X,Y);                           \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):          \
-    _FP_CHOOSENAN(fs, wc, R, X, Y);                     \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):       \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):          \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):         \
-    R##_s = X##_s;                                      \
-    _FP_FRAC_COPY_##wc(R, X);                           \
-    R##_c = X##_c;                                      \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):       \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):          \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):         \
-    R##_s = Y##_s;                                      \
-    _FP_FRAC_COPY_##wc(R, Y);                           \
-    R##_c = Y##_c;                                      \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):       \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):         \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):      \
-    R##_c = FP_CLS_ZERO;                                \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):      \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):         \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):       \
-    R##_c = FP_CLS_INF;                                 \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):          \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):        \
-    R##_c = FP_CLS_NAN;                                 \
-    _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);             \
-    break;                                              \
-                                                        \
-  default:                                              \
-    abort();                                            \
-  }                                                     \
-} while (0)
-
-
-/*
- * Main differential comparison routine.  The inputs should be raw not
- * cooked.  The return is -1,0,1 for normal values, 2 otherwise.
- */
-
-#define _FP_CMP(fs, wc, ret, X, Y, un)                                  \
-  do {                                                                  \
-    /* NANs are unordered */                                            \
-    if ((X##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(X))           \
-        || (Y##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(Y)))       \
-      {                                                                 \
-        ret = un;                                                       \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        int __x_zero = (!X##_e && _FP_FRAC_ZEROP_##wc(X)) ? 1 : 0;      \
-        int __y_zero = (!Y##_e && _FP_FRAC_ZEROP_##wc(Y)) ? 1 : 0;      \
-                                                                        \
-        if (__x_zero && __y_zero)                                       \
-          ret = 0;                                                      \
-        else if (__x_zero)                                              \
-          ret = Y##_s ? 1 : -1;                                         \
-        else if (__y_zero)                                              \
-          ret = X##_s ? -1 : 1;                                         \
-        else if (X##_s != Y##_s)                                        \
-          ret = X##_s ? -1 : 1;                                         \
-        else if (X##_e > Y##_e)                                         \
-          ret = X##_s ? -1 : 1;                                         \
-        else if (X##_e < Y##_e)                                         \
-          ret = X##_s ? 1 : -1;                                         \
-        else if (_FP_FRAC_GT_##wc(X, Y))                                \
-          ret = X##_s ? -1 : 1;                                         \
-        else if (_FP_FRAC_GT_##wc(Y, X))                                \
-          ret = X##_s ? 1 : -1;                                         \
-        else                                                            \
-          ret = 0;                                                      \
-      }                                                                 \
-  } while (0)
-
-
-/* Simplification for strict equality.  */
-
-#define _FP_CMP_EQ(fs, wc, ret, X, Y)                                     \
-  do {                                                                    \
-    /* NANs are unordered */                                              \
-    if ((X##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(X))             \
-        || (Y##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(Y)))         \
-      {                                                                   \
-        ret = 1;                                                          \
-      }                                                                   \
-    else                                                                  \
-      {                                                                   \
-        ret = !(X##_e == Y##_e                                            \
-                && _FP_FRAC_EQ_##wc(X, Y)                                 \
-                && (X##_s == Y##_s || !X##_e && _FP_FRAC_ZEROP_##wc(X))); \
-      }                                                                   \
-  } while (0)
-
-/*
- * Main square root routine.  The input value should be cooked.
- */
-
-#define _FP_SQRT(fs, wc, R, X)                                          \
-do {                                                                    \
-    _FP_FRAC_DECL_##wc(T); _FP_FRAC_DECL_##wc(S);                       \
-    _FP_W_TYPE q;                                                       \
-    switch (X##_c)                                                      \
-    {                                                                   \
-    case FP_CLS_NAN:                                                    \
-        R##_s = 0;                                                      \
-        R##_c = FP_CLS_NAN;                                             \
-        _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);                        \
-        break;                                                          \
-    case FP_CLS_INF:                                                    \
-        if (X##_s)                                                      \
-          {                                                             \
-            R##_s = 0;                                                  \
-            R##_c = FP_CLS_NAN; /* sNAN */                              \
-          }                                                             \
-        else                                                            \
-          {                                                             \
-            R##_s = 0;                                                  \
-            R##_c = FP_CLS_INF; /* sqrt(+inf) = +inf */                 \
-          }                                                             \
-        break;                                                          \
-    case FP_CLS_ZERO:                                                   \
-        R##_s = X##_s;                                                  \
-        R##_c = FP_CLS_ZERO; /* sqrt(+-0) = +-0 */                      \
-        break;                                                          \
-    case FP_CLS_NORMAL:                                                 \
-        R##_s = 0;                                                      \
-        if (X##_s)                                                      \
-          {                                                             \
-            R##_c = FP_CLS_NAN; /* sNAN */                              \
-            break;                                                      \
-          }                                                             \
-        R##_c = FP_CLS_NORMAL;                                          \
-        if (X##_e & 1)                                                  \
-          _FP_FRAC_SLL_##wc(X, 1);                                      \
-        R##_e = X##_e >> 1;                                             \
-        _FP_FRAC_SET_##wc(S, _FP_ZEROFRAC_##wc);                        \
-        _FP_FRAC_SET_##wc(R, _FP_ZEROFRAC_##wc);                        \
-        q = _FP_OVERFLOW_##fs;                                          \
-        _FP_FRAC_SLL_##wc(X, 1);                                        \
-        _FP_SQRT_MEAT_##wc(R, S, T, X, q);                              \
-        _FP_FRAC_SRL_##wc(R, 1);                                        \
-    }                                                                   \
-  } while (0)
-
-/*
- * Convert from FP to integer
- */
-
-/* "When a NaN, infinity, large positive argument >= 2147483648.0, or
- * large negative argument <= -2147483649.0 is converted to an integer,
- * the invalid_current bit...should be set and fp_exception_IEEE_754 should
- * be raised. If the floating point invalid trap is disabled, no trap occurs
- * and a numerical result is generated: if the sign bit of the operand
- * is 0, the result is 2147483647; if the sign bit of the operand is 1,
- * the result is -2147483648."
- * Similarly for conversion to extended ints, except that the boundaries
- * are >= 2^63, <= -(2^63 + 1), and the results are 2^63 + 1 for s=0 and
- * -2^63 for s=1.
- * -- SPARC Architecture Manual V9, Appendix B, which specifies how
- * SPARCs resolve implementation dependencies in the IEEE-754 spec.
- * I don't believe that the code below follows this. I'm not even sure
- * it's right!
- * It doesn't cope with needing to convert to an n bit integer when there
- * is no n bit integer type. Fortunately gcc provides long long so this
- * isn't a problem for sparc32.
- * I have, however, fixed its NaN handling to conform as above.
- *         -- PMM 02/1998
- * NB: rsigned is not 'is r declared signed?' but 'should the value stored
- * in r be signed or unsigned?'. r is always(?) declared unsigned.
- * Comments below are mine, BTW -- PMM
- */
-#define _FP_TO_INT(fs, wc, r, X, rsize, rsigned)                        \
-  do {                                                                  \
-    switch (X##_c)                                                      \
-      {                                                                 \
-      case FP_CLS_NORMAL:                                               \
-        if (X##_e < 0)                                                  \
-          {                                                             \
-          /* case FP_CLS_NAN: see above! */                             \
-          case FP_CLS_ZERO:                                             \
-            r = 0;                                                      \
-          }                                                             \
-        else if (X##_e >= rsize - (rsigned != 0))                       \
-          {     /* overflow */                                          \
-          case FP_CLS_NAN:                                              \
-          case FP_CLS_INF:                                              \
-            if (rsigned)                                                \
-              {                                                         \
-                r = 1;                                                  \
-                r <<= rsize - 1;                                        \
-                r -= 1 - X##_s;                                         \
-              }                                                         \
-            else                                                        \
-              {                                                         \
-                r = 0;                                                  \
-                if (!X##_s)                                             \
-                  r = ~r;                                               \
-              }                                                         \
-          }                                                             \
-        else                                                            \
-          {                                                             \
-            if (_FP_W_TYPE_SIZE*wc < rsize)                             \
-              {                                                         \
-                _FP_FRAC_ASSEMBLE_##wc(r, X, rsize);                    \
-                r <<= X##_e - _FP_WFRACBITS_##fs;                       \
-              }                                                         \
-            else                                                        \
-              {                                                         \
-                if (X##_e >= _FP_WFRACBITS_##fs)                        \
-                  _FP_FRAC_SLL_##wc(X, (X##_e - _FP_WFRACBITS_##fs + 1));\
-                else                                                    \
-                  _FP_FRAC_SRL_##wc(X, (_FP_WFRACBITS_##fs - X##_e - 1));\
-                _FP_FRAC_ASSEMBLE_##wc(r, X, rsize);                    \
-              }                                                         \
-            if (rsigned && X##_s)                                       \
-              r = -r;                                                   \
-          }                                                             \
-        break;                                                          \
-      }                                                                 \
-  } while (0)
-
-#define _FP_FROM_INT(fs, wc, X, r, rsize, rtype)                        \
-  do {                                                                  \
-    if (r)                                                              \
-      {                                                                 \
-        X##_c = FP_CLS_NORMAL;                                          \
-                                                                        \
-        if ((X##_s = (r < 0)))                                          \
-          r = -r;                                                       \
-        /* Note that `r' is now considered unsigned, so we don't have   \
-           to worry about the single signed overflow case.  */          \
-                                                                        \
-        if (rsize <= _FP_W_TYPE_SIZE)                                   \
-          __FP_CLZ(X##_e, r);                                           \
-        else                                                            \
-          __FP_CLZ_2(X##_e, (_FP_W_TYPE)(r >> _FP_W_TYPE_SIZE),         \
-                     (_FP_W_TYPE)r);                                    \
-        if (rsize < _FP_W_TYPE_SIZE)                                    \
-                X##_e -= (_FP_W_TYPE_SIZE - rsize);                     \
-        X##_e = rsize - X##_e - 1;                                      \
-                                                                        \
-        if (_FP_FRACBITS_##fs < rsize && _FP_WFRACBITS_##fs < X##_e)    \
-          __FP_FRAC_SRS_1(r, (X##_e - _FP_WFRACBITS_##fs), rsize);      \
-        r &= ~((_FP_W_TYPE)1 << X##_e);                                 \
-        _FP_FRAC_DISASSEMBLE_##wc(X, ((unsigned rtype)r), rsize);       \
-        _FP_FRAC_SLL_##wc(X, (_FP_WFRACBITS_##fs - X##_e - 1));         \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        X##_c = FP_CLS_ZERO, X##_s = 0;                                 \
-      }                                                                 \
-  } while (0)
-
-
-#define FP_CONV(dfs,sfs,dwc,swc,D,S)                    \
-  do {                                                  \
-    _FP_FRAC_CONV_##dwc##_##swc(dfs, sfs, D, S);        \
-    D##_e = S##_e;                                      \
-    D##_c = S##_c;                                      \
-    D##_s = S##_s;                                      \
-  } while (0)
-
-/*
- * Helper primitives.
- */
-
-/* Count leading zeros in a word.  */
-
-#ifndef __FP_CLZ
-#if _FP_W_TYPE_SIZE < 64
-/* this is just to shut the compiler up about shifts > word length -- PMM 02/1998 */
-#define __FP_CLZ(r, x)                          \
-  do {                                          \
-    _FP_W_TYPE _t = (x);                        \
-    r = _FP_W_TYPE_SIZE - 1;                    \
-    if (_t > 0xffff) r -= 16;                   \
-    if (_t > 0xffff) _t >>= 16;                 \
-    if (_t > 0xff) r -= 8;                      \
-    if (_t > 0xff) _t >>= 8;                    \
-    if (_t & 0xf0) r -= 4;                      \
-    if (_t & 0xf0) _t >>= 4;                    \
-    if (_t & 0xc) r -= 2;                       \
-    if (_t & 0xc) _t >>= 2;                     \
-    if (_t & 0x2) r -= 1;                       \
-  } while (0)
-#else /* not _FP_W_TYPE_SIZE < 64 */
-#define __FP_CLZ(r, x)                          \
-  do {                                          \
-    _FP_W_TYPE _t = (x);                        \
-    r = _FP_W_TYPE_SIZE - 1;                    \
-    if (_t > 0xffffffff) r -= 32;               \
-    if (_t > 0xffffffff) _t >>= 32;             \
-    if (_t > 0xffff) r -= 16;                   \
-    if (_t > 0xffff) _t >>= 16;                 \
-    if (_t > 0xff) r -= 8;                      \
-    if (_t > 0xff) _t >>= 8;                    \
-    if (_t & 0xf0) r -= 4;                      \
-    if (_t & 0xf0) _t >>= 4;                    \
-    if (_t & 0xc) r -= 2;                       \
-    if (_t & 0xc) _t >>= 2;                     \
-    if (_t & 0x2) r -= 1;                       \
-  } while (0)
-#endif /* not _FP_W_TYPE_SIZE < 64 */
-#endif /* ndef __FP_CLZ */
-
-#define _FP_DIV_HELP_imm(q, r, n, d)            \
-  do {                                          \
-    q = n / d, r = n % d;                       \
-  } while (0)
-
diff --git a/arch/ppc/math-emu/sfp-machine.h b/arch/ppc/math-emu/sfp-machine.h
deleted file mode 100644
index 4b17d83cfcdd..000000000000
--- a/arch/ppc/math-emu/sfp-machine.h
+++ /dev/null
@@ -1,377 +0,0 @@
-/* Machine-dependent software floating-point definitions.  PPC version.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Actually, this is a PPC (32bit) version, written based on the
-   i386, sparc, and sparc64 versions, by me,
-   Peter Maydell (pmaydell@chiark.greenend.org.uk).
-   Comments are by and large also mine, although they may be inaccurate.
-
-   In picking out asm fragments I've gone with the lowest common
-   denominator, which also happens to be the hardware I have :->
-   That is, a SPARC without hardware multiply and divide.
- */
-
-/* basic word size definitions */
-#define _FP_W_TYPE_SIZE         32
-#define _FP_W_TYPE              unsigned long
-#define _FP_WS_TYPE             signed long
-#define _FP_I_TYPE              long
-
-#define __ll_B                  ((UWtype) 1 << (W_TYPE_SIZE / 2))
-#define __ll_lowpart(t)         ((UWtype) (t) & (__ll_B - 1))
-#define __ll_highpart(t)        ((UWtype) (t) >> (W_TYPE_SIZE / 2))
-
-/* You can optionally code some things like addition in asm. For
- * example, i386 defines __FP_FRAC_ADD_2 as asm. If you don't
- * then you get a fragment of C code [if you change an #ifdef 0
- * in op-2.h] or a call to add_ssaaaa (see below).
- * Good places to look for asm fragments to use are gcc and glibc.
- * gcc's longlong.h is useful.
- */
-
-/* We need to know how to multiply and divide. If the host word size
- * is >= 2*fracbits you can use FP_MUL_MEAT_n_imm(t,R,X,Y) which
- * codes the multiply with whatever gcc does to 'a * b'.
- * _FP_MUL_MEAT_n_wide(t,R,X,Y,f) is used when you have an asm
- * function that can multiply two 1W values and get a 2W result.
- * Otherwise you're stuck with _FP_MUL_MEAT_n_hard(t,R,X,Y) which
- * does bitshifting to avoid overflow.
- * For division there is FP_DIV_MEAT_n_imm(t,R,X,Y,f) for word size
- * >= 2*fracbits, where f is either _FP_DIV_HELP_imm or
- * _FP_DIV_HELP_ldiv (see op-1.h).
- * _FP_DIV_MEAT_udiv() is if you have asm to do 2W/1W => (1W, 1W).
- * [GCC and glibc have longlong.h which has the asm macro udiv_qrnnd
- * to do this.]
- * In general, 'n' is the number of words required to hold the type,
- * and 't' is either S, D or Q for single/double/quad.
- *           -- PMM
- */
-/* Example: SPARC64:
- * #define _FP_MUL_MEAT_S(R,X,Y)        _FP_MUL_MEAT_1_imm(S,R,X,Y)
- * #define _FP_MUL_MEAT_D(R,X,Y)        _FP_MUL_MEAT_1_wide(D,R,X,Y,umul_ppmm)
- * #define _FP_MUL_MEAT_Q(R,X,Y)        _FP_MUL_MEAT_2_wide(Q,R,X,Y,umul_ppmm)
- *
- * #define _FP_DIV_MEAT_S(R,X,Y)        _FP_DIV_MEAT_1_imm(S,R,X,Y,_FP_DIV_HELP_imm)
- * #define _FP_DIV_MEAT_D(R,X,Y)        _FP_DIV_MEAT_1_udiv(D,R,X,Y)
- * #define _FP_DIV_MEAT_Q(R,X,Y)        _FP_DIV_MEAT_2_udiv_64(Q,R,X,Y)
- *
- * Example: i386:
- * #define _FP_MUL_MEAT_S(R,X,Y)   _FP_MUL_MEAT_1_wide(S,R,X,Y,_i386_mul_32_64)
- * #define _FP_MUL_MEAT_D(R,X,Y)   _FP_MUL_MEAT_2_wide(D,R,X,Y,_i386_mul_32_64)
- *
- * #define _FP_DIV_MEAT_S(R,X,Y)   _FP_DIV_MEAT_1_udiv(S,R,X,Y,_i386_div_64_32)
- * #define _FP_DIV_MEAT_D(R,X,Y)   _FP_DIV_MEAT_2_udiv_64(D,R,X,Y)
- */
-
-#define _FP_MUL_MEAT_S(R,X,Y)   _FP_MUL_MEAT_1_wide(S,R,X,Y,umul_ppmm)
-#define _FP_MUL_MEAT_D(R,X,Y)   _FP_MUL_MEAT_2_wide(D,R,X,Y,umul_ppmm)
-
-#define _FP_DIV_MEAT_S(R,X,Y)   _FP_DIV_MEAT_1_udiv(S,R,X,Y)
-#define _FP_DIV_MEAT_D(R,X,Y)   _FP_DIV_MEAT_2_udiv_64(D,R,X,Y)
-
-/* These macros define what NaN looks like. They're supposed to expand to
- * a comma-separated set of 32bit unsigned ints that encode NaN.
- */
-#define _FP_NANFRAC_S           _FP_QNANBIT_S
-#define _FP_NANFRAC_D           _FP_QNANBIT_D, 0
-#define _FP_NANFRAC_Q           _FP_QNANBIT_Q, 0, 0, 0
-
-#define _FP_KEEPNANFRACP 1
-
-/* This macro appears to be called when both X and Y are NaNs, and
- * has to choose one and copy it to R. i386 goes for the larger of the
- * two, sparc64 just picks Y. I don't understand this at all so I'll
- * go with sparc64 because it's shorter :->   -- PMM
- */
-#define _FP_CHOOSENAN(fs, wc, R, X, Y)                  \
-  do {                                                  \
-    R##_s = Y##_s;                                      \
-    _FP_FRAC_COPY_##wc(R,Y);                            \
-    R##_c = FP_CLS_NAN;                                 \
-  } while (0)
-
-
-extern void fp_unpack_d(long *, unsigned long *, unsigned long *,
-                        long *, long *, void *);
-extern int  fp_pack_d(void *, long, unsigned long, unsigned long, long, long);
-extern int  fp_pack_ds(void *, long, unsigned long, unsigned long, long, long);
-
-#define __FP_UNPACK_RAW_1(fs, X, val)                   \
-  do {                                                  \
-    union _FP_UNION_##fs *_flo =                        \
-        (union _FP_UNION_##fs *)val;                    \
-                                                        \
-    X##_f = _flo->bits.frac;                            \
-    X##_e = _flo->bits.exp;                             \
-    X##_s = _flo->bits.sign;                            \
-  } while (0)
-
-#define __FP_UNPACK_RAW_2(fs, X, val)                   \
-  do {                                                  \
-    union _FP_UNION_##fs *_flo =                        \
-        (union _FP_UNION_##fs *)val;                    \
-                                                        \
-    X##_f0 = _flo->bits.frac0;                          \
-    X##_f1 = _flo->bits.frac1;                          \
-    X##_e  = _flo->bits.exp;                            \
-    X##_s  = _flo->bits.sign;                           \
-  } while (0)
-
-#define __FP_UNPACK_S(X,val)            \
-  do {                                  \
-    __FP_UNPACK_RAW_1(S,X,val);         \
-    _FP_UNPACK_CANONICAL(S,1,X);        \
-  } while (0)
-
-#define __FP_UNPACK_D(X,val)            \
-        fp_unpack_d(&X##_s, &X##_f1, &X##_f0, &X##_e, &X##_c, val)
-
-#define __FP_PACK_RAW_1(fs, val, X)                     \
-  do {                                                  \
-    union _FP_UNION_##fs *_flo =                        \
-        (union _FP_UNION_##fs *)val;                    \
-                                                        \
-    _flo->bits.frac = X##_f;                            \
-    _flo->bits.exp  = X##_e;                            \
-    _flo->bits.sign = X##_s;                            \
-  } while (0)
-
-#define __FP_PACK_RAW_2(fs, val, X)                     \
-  do {                                                  \
-    union _FP_UNION_##fs *_flo =                        \
-        (union _FP_UNION_##fs *)val;                    \
-                                                        \
-    _flo->bits.frac0 = X##_f0;                          \
-    _flo->bits.frac1 = X##_f1;                          \
-    _flo->bits.exp   = X##_e;                           \
-    _flo->bits.sign  = X##_s;                           \
-  } while (0)
-
-#include <linux/kernel.h>
-#include <linux/sched.h>
-
-#define __FPU_FPSCR     (current->thread.fpscr.val)
-
-/* We only actually write to the destination register
- * if exceptions signalled (if any) will not trap.
- */
-#define __FPU_ENABLED_EXC \
-({                                              \
-        (__FPU_FPSCR >> 3) & 0x1f;      \
-})
-
-#define __FPU_TRAP_P(bits) \
-        ((__FPU_ENABLED_EXC & (bits)) != 0)
-
-#define __FP_PACK_S(val,X)                      \
-({  int __exc = _FP_PACK_CANONICAL(S,1,X);      \
-    if(!__exc || !__FPU_TRAP_P(__exc))          \
-        __FP_PACK_RAW_1(S,val,X);               \
-    __exc;                                      \
-})
-
-#define __FP_PACK_D(val,X)                      \
-        fp_pack_d(val, X##_s, X##_f1, X##_f0, X##_e, X##_c)
-
-#define __FP_PACK_DS(val,X)                     \
-        fp_pack_ds(val, X##_s, X##_f1, X##_f0, X##_e, X##_c)
-
-/* Obtain the current rounding mode. */
-#define FP_ROUNDMODE                    \
-({                                      \
-        __FPU_FPSCR & 0x3;              \
-})
-
-/* the asm fragments go here: all these are taken from glibc-2.0.5's
- * stdlib/longlong.h
- */
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/* add_ssaaaa is used in op-2.h and should be equivalent to
- * #define add_ssaaaa(sh,sl,ah,al,bh,bl) (sh = ah+bh+ (( sl = al+bl) < al))
- * add_ssaaaa(high_sum, low_sum, high_addend_1, low_addend_1,
- * high_addend_2, low_addend_2) adds two UWtype integers, composed by
- * HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and LOW_ADDEND_2
- * respectively.  The result is placed in HIGH_SUM and LOW_SUM.  Overflow
- * (i.e. carry out) is not stored anywhere, and is lost.
- */
-#define add_ssaaaa(sh, sl, ah, al, bh, bl)                              \
-  do {                                                                  \
-    if (__builtin_constant_p (bh) && (bh) == 0)                         \
-      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2"           \
-             : "=r" ((USItype)(sh)),                                    \
-               "=&r" ((USItype)(sl))                                    \
-             : "%r" ((USItype)(ah)),                                    \
-               "%r" ((USItype)(al)),                                    \
-               "rI" ((USItype)(bl)));                                   \
-    else if (__builtin_constant_p (bh) && (bh) ==~(USItype) 0)          \
-      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2"           \
-             : "=r" ((USItype)(sh)),                                    \
-               "=&r" ((USItype)(sl))                                    \
-             : "%r" ((USItype)(ah)),                                    \
-               "%r" ((USItype)(al)),                                    \
-               "rI" ((USItype)(bl)));                                   \
-    else                                                                \
-      __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3"          \
-             : "=r" ((USItype)(sh)),                                    \
-               "=&r" ((USItype)(sl))                                    \
-             : "%r" ((USItype)(ah)),                                    \
-               "r" ((USItype)(bh)),                                     \
-               "%r" ((USItype)(al)),                                    \
-               "rI" ((USItype)(bl)));                                   \
-  } while (0)
-
-/* sub_ddmmss is used in op-2.h and udivmodti4.c and should be equivalent to
- * #define sub_ddmmss(sh, sl, ah, al, bh, bl) (sh = ah-bh - ((sl = al-bl) > al))
- * sub_ddmmss(high_difference, low_difference, high_minuend, low_minuend,
- * high_subtrahend, low_subtrahend) subtracts two two-word UWtype integers,
- * composed by HIGH_MINUEND_1 and LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and
- * LOW_SUBTRAHEND_2 respectively.  The result is placed in HIGH_DIFFERENCE
- * and LOW_DIFFERENCE.  Overflow (i.e. carry out) is not stored anywhere,
- * and is lost.
- */
-#define sub_ddmmss(sh, sl, ah, al, bh, bl)                              \
-  do {                                                                  \
-    if (__builtin_constant_p (ah) && (ah) == 0)                         \
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2"       \
-               : "=r" ((USItype)(sh)),                                  \
-                 "=&r" ((USItype)(sl))                                  \
-               : "r" ((USItype)(bh)),                                   \
-                 "rI" ((USItype)(al)),                                  \
-                 "r" ((USItype)(bl)));                                  \
-    else if (__builtin_constant_p (ah) && (ah) ==~(USItype) 0)          \
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2"       \
-               : "=r" ((USItype)(sh)),                                  \
-                 "=&r" ((USItype)(sl))                                  \
-               : "r" ((USItype)(bh)),                                   \
-                 "rI" ((USItype)(al)),                                  \
-                 "r" ((USItype)(bl)));                                  \
-    else if (__builtin_constant_p (bh) && (bh) == 0)                    \
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2"         \
-               : "=r" ((USItype)(sh)),                                  \
-                 "=&r" ((USItype)(sl))                                  \
-               : "r" ((USItype)(ah)),                                   \
-                 "rI" ((USItype)(al)),                                  \
-                 "r" ((USItype)(bl)));                                  \
-    else if (__builtin_constant_p (bh) && (bh) ==~(USItype) 0)          \
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2"         \
-               : "=r" ((USItype)(sh)),                                  \
-                 "=&r" ((USItype)(sl))                                  \
-               : "r" ((USItype)(ah)),                                   \
-                 "rI" ((USItype)(al)),                                  \
-                 "r" ((USItype)(bl)));                                  \
-    else                                                                \
-      __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2"      \
-               : "=r" ((USItype)(sh)),                                  \
-                 "=&r" ((USItype)(sl))                                  \
-               : "r" ((USItype)(ah)),                                   \
-                 "r" ((USItype)(bh)),                                   \
-                 "rI" ((USItype)(al)),                                  \
-                 "r" ((USItype)(bl)));                                  \
-  } while (0)
-
-/* asm fragments for mul and div */
-
-/* umul_ppmm(high_prod, low_prod, multipler, multiplicand) multiplies two
- * UWtype integers MULTIPLER and MULTIPLICAND, and generates a two UWtype
- * word product in HIGH_PROD and LOW_PROD.
- */
-#define umul_ppmm(ph, pl, m0, m1)                                       \
-  do {                                                                  \
-    USItype __m0 = (m0), __m1 = (m1);                                   \
-    __asm__ ("mulhwu %0,%1,%2"                                          \
-             : "=r" ((USItype)(ph))                                     \
-             : "%r" (__m0),                                             \
-               "r" (__m1));                                             \
-    (pl) = __m0 * __m1;                                                 \
-  } while (0)
-
-/* udiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
- * denominator) divides a UDWtype, composed by the UWtype integers
- * HIGH_NUMERATOR and LOW_NUMERATOR, by DENOMINATOR and places the quotient
- * in QUOTIENT and the remainder in REMAINDER.  HIGH_NUMERATOR must be less
- * than DENOMINATOR for correct operation.  If, in addition, the most
- * significant bit of DENOMINATOR must be 1, then the pre-processor symbol
- * UDIV_NEEDS_NORMALIZATION is defined to 1.
- */
-#define udiv_qrnnd(q, r, n1, n0, d)                                     \
-  do {                                                                  \
-    UWtype __d1, __d0, __q1, __q0, __r1, __r0, __m;                     \
-    __d1 = __ll_highpart (d);                                           \
-    __d0 = __ll_lowpart (d);                                            \
-                                                                        \
-    __r1 = (n1) % __d1;                                                 \
-    __q1 = (n1) / __d1;                                                 \
-    __m = (UWtype) __q1 * __d0;                                         \
-    __r1 = __r1 * __ll_B | __ll_highpart (n0);                          \
-    if (__r1 < __m)                                                     \
-      {                                                                 \
-        __q1--, __r1 += (d);                                            \
-        if (__r1 >= (d)) /* we didn't get carry when adding to __r1 */  \
-          if (__r1 < __m)                                               \
-            __q1--, __r1 += (d);                                        \
-      }                                                                 \
-    __r1 -= __m;                                                        \
-                                                                        \
-    __r0 = __r1 % __d1;                                                 \
-    __q0 = __r1 / __d1;                                                 \
-    __m = (UWtype) __q0 * __d0;                                         \
-    __r0 = __r0 * __ll_B | __ll_lowpart (n0);                           \
-    if (__r0 < __m)                                                     \
-      {                                                                 \
-        __q0--, __r0 += (d);                                            \
-        if (__r0 >= (d))                                                \
-          if (__r0 < __m)                                               \
-            __q0--, __r0 += (d);                                        \
-      }                                                                 \
-    __r0 -= __m;                                                        \
-                                                                        \
-    (q) = (UWtype) __q1 * __ll_B | __q0;                                \
-    (r) = __r0;                                                         \
-  } while (0)
-
-#define UDIV_NEEDS_NORMALIZATION 1
-
-#define abort()                                                         \
-        return 0
-
-#ifdef __BIG_ENDIAN
-#define __BYTE_ORDER __BIG_ENDIAN
-#else
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#endif
-
-/* Exception flags. */
-#define EFLAG_INVALID           (1 << (31 - 2))
-#define EFLAG_OVERFLOW          (1 << (31 - 3))
-#define EFLAG_UNDERFLOW         (1 << (31 - 4))
-#define EFLAG_DIVZERO           (1 << (31 - 5))
-#define EFLAG_INEXACT           (1 << (31 - 6))
-
-#define EFLAG_VXSNAN            (1 << (31 - 7))
-#define EFLAG_VXISI             (1 << (31 - 8))
-#define EFLAG_VXIDI             (1 << (31 - 9))
-#define EFLAG_VXZDZ             (1 << (31 - 10))
-#define EFLAG_VXIMZ             (1 << (31 - 11))
-#define EFLAG_VXVC              (1 << (31 - 12))
-#define EFLAG_VXSOFT            (1 << (31 - 21))
-#define EFLAG_VXSQRT            (1 << (31 - 22))
-#define EFLAG_VXCVI             (1 << (31 - 23))
diff --git a/arch/ppc/math-emu/single.h b/arch/ppc/math-emu/single.h
deleted file mode 100644
index f19d99451815..000000000000
--- a/arch/ppc/math-emu/single.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Definitions for IEEE Single Precision
- */
-
-#if _FP_W_TYPE_SIZE < 32
-#error "Here's a nickel kid.  Go buy yourself a real computer."
-#endif
-
-#define _FP_FRACBITS_S          24
-#define _FP_FRACXBITS_S         (_FP_W_TYPE_SIZE - _FP_FRACBITS_S)
-#define _FP_WFRACBITS_S         (_FP_WORKBITS + _FP_FRACBITS_S)
-#define _FP_WFRACXBITS_S        (_FP_W_TYPE_SIZE - _FP_WFRACBITS_S)
-#define _FP_EXPBITS_S           8
-#define _FP_EXPBIAS_S           127
-#define _FP_EXPMAX_S            255
-#define _FP_QNANBIT_S           ((_FP_W_TYPE)1 << (_FP_FRACBITS_S-2))
-#define _FP_IMPLBIT_S           ((_FP_W_TYPE)1 << (_FP_FRACBITS_S-1))
-#define _FP_OVERFLOW_S          ((_FP_W_TYPE)1 << (_FP_WFRACBITS_S))
-
-/* The implementation of _FP_MUL_MEAT_S and _FP_DIV_MEAT_S should be
-   chosen by the target machine.  */
-
-union _FP_UNION_S
-{
-  float flt;
-  struct {
-#if __BYTE_ORDER == __BIG_ENDIAN
-    unsigned sign : 1;
-    unsigned exp  : _FP_EXPBITS_S;
-    unsigned frac : _FP_FRACBITS_S - (_FP_IMPLBIT_S != 0);
-#else
-    unsigned frac : _FP_FRACBITS_S - (_FP_IMPLBIT_S != 0);
-    unsigned exp  : _FP_EXPBITS_S;
-    unsigned sign : 1;
-#endif
-  } bits __attribute__((packed));
-};
-
-#define FP_DECL_S(X)            _FP_DECL(1,X)
-#define FP_UNPACK_RAW_S(X,val)  _FP_UNPACK_RAW_1(S,X,val)
-#define FP_PACK_RAW_S(val,X)    _FP_PACK_RAW_1(S,val,X)
-
-#define FP_UNPACK_S(X,val)              \
-  do {                                  \
-    _FP_UNPACK_RAW_1(S,X,val);          \
-    _FP_UNPACK_CANONICAL(S,1,X);        \
-  } while (0)
-
-#define FP_PACK_S(val,X)                \
-  do {                                  \
-    _FP_PACK_CANONICAL(S,1,X);          \
-    _FP_PACK_RAW_1(S,val,X);            \
-  } while (0)
-
-#define FP_NEG_S(R,X)           _FP_NEG(S,1,R,X)
-#define FP_ADD_S(R,X,Y)         _FP_ADD(S,1,R,X,Y)
-#define FP_SUB_S(R,X,Y)         _FP_SUB(S,1,R,X,Y)
-#define FP_MUL_S(R,X,Y)         _FP_MUL(S,1,R,X,Y)
-#define FP_DIV_S(R,X,Y)         _FP_DIV(S,1,R,X,Y)
-#define FP_SQRT_S(R,X)          _FP_SQRT(S,1,R,X)
-
-#define FP_CMP_S(r,X,Y,un)      _FP_CMP(S,1,r,X,Y,un)
-#define FP_CMP_EQ_S(r,X,Y)      _FP_CMP_EQ(S,1,r,X,Y)
-
-#define FP_TO_INT_S(r,X,rsz,rsg)  _FP_TO_INT(S,1,r,X,rsz,rsg)
-#define FP_FROM_INT_S(X,r,rs,rt)  _FP_FROM_INT(S,1,X,r,rs,rt)
diff --git a/arch/ppc/math-emu/soft-fp.h b/arch/ppc/math-emu/soft-fp.h
deleted file mode 100644
index cca39598f873..000000000000
--- a/arch/ppc/math-emu/soft-fp.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef SOFT_FP_H
-#define SOFT_FP_H
-
-#include "sfp-machine.h"
-
-#define _FP_WORKBITS            3
-#define _FP_WORK_LSB            ((_FP_W_TYPE)1 << 3)
-#define _FP_WORK_ROUND          ((_FP_W_TYPE)1 << 2)
-#define _FP_WORK_GUARD          ((_FP_W_TYPE)1 << 1)
-#define _FP_WORK_STICKY         ((_FP_W_TYPE)1 << 0)
-
-#ifndef FP_RND_NEAREST
-# define FP_RND_NEAREST         0
-# define FP_RND_ZERO            1
-# define FP_RND_PINF            2
-# define FP_RND_MINF            3
-#ifndef FP_ROUNDMODE
-# define FP_ROUNDMODE           FP_RND_NEAREST
-#endif
-#endif
-
-#define _FP_ROUND_NEAREST(wc, X)                        \
-({  int __ret = 0;                                      \
-    int __frac = _FP_FRAC_LOW_##wc(X) & 15;             \
-    if (__frac & 7) {                                   \
-      __ret = EFLAG_INEXACT;                            \
-      if ((__frac & 7) != _FP_WORK_ROUND)               \
-        _FP_FRAC_ADDI_##wc(X, _FP_WORK_ROUND);          \
-      else if (__frac & _FP_WORK_LSB)                   \
-        _FP_FRAC_ADDI_##wc(X, _FP_WORK_ROUND);          \
-    }                                                   \
-    __ret;                                              \
-})
-
-#define _FP_ROUND_ZERO(wc, X)                           \
-({  int __ret = 0;                                      \
-    if (_FP_FRAC_LOW_##wc(X) & 7)                       \
-      __ret = EFLAG_INEXACT;                            \
-    __ret;                                              \
-})
-
-#define _FP_ROUND_PINF(wc, X)                           \
-({  int __ret = EFLAG_INEXACT;                          \
-    if (!X##_s && (_FP_FRAC_LOW_##wc(X) & 7))           \
-      _FP_FRAC_ADDI_##wc(X, _FP_WORK_LSB);              \
-    else __ret = 0;                                     \
-    __ret;                                              \
-})
-
-#define _FP_ROUND_MINF(wc, X)                           \
-({  int __ret = EFLAG_INEXACT;                          \
-    if (X##_s && (_FP_FRAC_LOW_##wc(X) & 7))            \
-      _FP_FRAC_ADDI_##wc(X, _FP_WORK_LSB);              \
-    else __ret = 0;                                     \
-    __ret;                                              \
-})
-
-#define _FP_ROUND(wc, X)                        \
-({      int __ret = 0;                          \
-        switch (FP_ROUNDMODE)                   \
-        {                                       \
-          case FP_RND_NEAREST:                  \
-            __ret |= _FP_ROUND_NEAREST(wc,X);   \
-            break;                              \
-          case FP_RND_ZERO:                     \
-            __ret |= _FP_ROUND_ZERO(wc,X);      \
-            break;                              \
-          case FP_RND_PINF:                     \
-            __ret |= _FP_ROUND_PINF(wc,X);      \
-            break;                              \
-          case FP_RND_MINF:                     \
-            __ret |= _FP_ROUND_MINF(wc,X);      \
-            break;                              \
-        };                                      \
-        __ret;                                  \
-})
-
-#define FP_CLS_NORMAL           0
-#define FP_CLS_ZERO             1
-#define FP_CLS_INF              2
-#define FP_CLS_NAN              3
-
-#define _FP_CLS_COMBINE(x,y)    (((x) << 2) | (y))
-
-#include "op-1.h"
-#include "op-2.h"
-#include "op-4.h"
-#include "op-common.h"
-
-/* Sigh.  Silly things longlong.h needs.  */
-#define UWtype          _FP_W_TYPE
-#define W_TYPE_SIZE     _FP_W_TYPE_SIZE
-
-typedef int SItype __attribute__((mode(SI)));
-typedef int DItype __attribute__((mode(DI)));
-typedef unsigned int USItype __attribute__((mode(SI)));
-typedef unsigned int UDItype __attribute__((mode(DI)));
-#if _FP_W_TYPE_SIZE == 32
-typedef unsigned int UHWtype __attribute__((mode(HI)));
-#elif _FP_W_TYPE_SIZE == 64
-typedef USItype UHWtype;
-#endif
-
-#endif
diff --git a/arch/ppc/math-emu/stfd.c b/arch/ppc/math-emu/stfd.c
deleted file mode 100644
index 3f8c2558a9e8..000000000000
--- a/arch/ppc/math-emu/stfd.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-stfd(void *frS, void *ea)
-{
-#if 0
-#ifdef DEBUG
-        printk("%s: S %p, ea %p: ", __FUNCTION__, frS, ea);
-        dump_double(frS);
-        printk("\n");
-#endif
-#endif
-
-        if (copy_to_user(ea, frS, sizeof(double)))
-                return -EFAULT;
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/stfiwx.c b/arch/ppc/math-emu/stfiwx.c
deleted file mode 100644
index 95caaeec6a08..000000000000
--- a/arch/ppc/math-emu/stfiwx.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-stfiwx(u32 *frS, void *ea)
-{
-#ifdef DEBUG
-        printk("%s: %p %p\n", __FUNCTION__, frS, ea);
-#endif
-
-        if (copy_to_user(ea, &frS[1], sizeof(frS[1])))
-                return -EFAULT;
-
-        return 0;
-}
diff --git a/arch/ppc/math-emu/stfs.c b/arch/ppc/math-emu/stfs.c
deleted file mode 100644
index e87ca23c6dc3..000000000000
--- a/arch/ppc/math-emu/stfs.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-int
-stfs(void *frS, void *ea)
-{
-        FP_DECL_D(A);
-        FP_DECL_S(R);
-        float f;
-        int err;
-
-#ifdef DEBUG
-        printk("%s: S %p, ea %p\n", __FUNCTION__, frS, ea);
-#endif
-
-        __FP_UNPACK_D(A, frS);
-
-#ifdef DEBUG
-        printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-#endif
-
-        FP_CONV(S, D, 1, 2, R, A);
-
-#ifdef DEBUG
-        printk("R: %ld %lu %ld (%ld)\n", R_s, R_f, R_e, R_c);
-#endif
-
-        err = _FP_PACK_CANONICAL(S, 1, R);
-        if (!err || !__FPU_TRAP_P(err)) {
-                __FP_PACK_RAW_1(S, &f, R);
-                if (copy_to_user(ea, &f, sizeof(float)))
-                        return -EFAULT;
-        }
-
-        return err;
-}
diff --git a/arch/ppc/math-emu/types.c b/arch/ppc/math-emu/types.c
deleted file mode 100644
index e1ed15d829db..000000000000
--- a/arch/ppc/math-emu/types.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-void
-fp_unpack_d(long *_s, unsigned long *_f1, unsigned long *_f0,
-            long *_e, long *_c, void *val)
-{
-        FP_DECL_D(X);
-
-        __FP_UNPACK_RAW_2(D, X, val);
-
-        _FP_UNPACK_CANONICAL(D, 2, X);
-
-        *_s = X_s;
-        *_f1 = X_f1;
-        *_f0 = X_f0;
-        *_e = X_e;
-        *_c = X_c;
-}
-
-int
-fp_pack_d(void *val, long X_s, unsigned long X_f1,
-          unsigned long X_f0, long X_e, long X_c)
-{
-        int exc;
-
-        exc = _FP_PACK_CANONICAL(D, 2, X);
-        if (!exc || !__FPU_TRAP_P(exc))
-                __FP_PACK_RAW_2(D, val, X);
-        return exc;
-}
-
-int
-fp_pack_ds(void *val, long X_s, unsigned long X_f1,
-           unsigned long X_f0, long X_e, long X_c)
-{
-        FP_DECL_S(__X);
-        int exc;
-
-        FP_CONV(S, D, 1, 2, __X, X);
-        exc = _FP_PACK_CANONICAL(S, 1, __X);
-        if (!exc || !__FPU_TRAP_P(exc)) {
-                _FP_UNPACK_CANONICAL(S, 1, __X);
-                FP_CONV(D, S, 2, 1, X, __X);
-                exc |= _FP_PACK_CANONICAL(D, 2, X);
-                if (!exc || !__FPU_TRAP_P(exc))
-                        __FP_PACK_RAW_2(D, val, X);
-        }
-        return exc;
-}
diff --git a/arch/ppc/math-emu/udivmodti4.c b/arch/ppc/math-emu/udivmodti4.c
deleted file mode 100644
index 7e112dc1e2f2..000000000000
--- a/arch/ppc/math-emu/udivmodti4.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* This has so very few changes over libgcc2's __udivmoddi4 it isn't funny.  */
-
-#include "soft-fp.h"
-
-#undef count_leading_zeros
-#define count_leading_zeros  __FP_CLZ
-
-void
-_fp_udivmodti4(_FP_W_TYPE q[2], _FP_W_TYPE r[2],
-               _FP_W_TYPE n1, _FP_W_TYPE n0,
-               _FP_W_TYPE d1, _FP_W_TYPE d0)
-{
-  _FP_W_TYPE q0, q1, r0, r1;
-  _FP_I_TYPE b, bm;
-
-  if (d1 == 0)
-    {
-#if !UDIV_NEEDS_NORMALIZATION
-      if (d0 > n1)
-        {
-          /* 0q = nn / 0D */
-
-          udiv_qrnnd (q0, n0, n1, n0, d0);
-          q1 = 0;
-
-          /* Remainder in n0.  */
-        }
-      else
-        {
-          /* qq = NN / 0d */
-
-          if (d0 == 0)
-            d0 = 1 / d0;        /* Divide intentionally by zero.  */
-
-          udiv_qrnnd (q1, n1, 0, n1, d0);
-          udiv_qrnnd (q0, n0, n1, n0, d0);
-
-          /* Remainder in n0.  */
-        }
-
-      r0 = n0;
-      r1 = 0;
-
-#else /* UDIV_NEEDS_NORMALIZATION */
-
-      if (d0 > n1)
-        {
-          /* 0q = nn / 0D */
-
-          count_leading_zeros (bm, d0);
-
-          if (bm != 0)
-            {
-              /* Normalize, i.e. make the most significant bit of the
-                 denominator set.  */
-
-              d0 = d0 << bm;
-              n1 = (n1 << bm) | (n0 >> (_FP_W_TYPE_SIZE - bm));
-              n0 = n0 << bm;
-            }
-
-          udiv_qrnnd (q0, n0, n1, n0, d0);
-          q1 = 0;
-
-          /* Remainder in n0 >> bm.  */
-        }
-      else
-        {
-          /* qq = NN / 0d */
-
-          if (d0 == 0)
-            d0 = 1 / d0;        /* Divide intentionally by zero.  */
-
-          count_leading_zeros (bm, d0);
-
-          if (bm == 0)
-            {
-              /* From (n1 >= d0) /\ (the most significant bit of d0 is set),
-                 conclude (the most significant bit of n1 is set) /\ (the
-                 leading quotient digit q1 = 1).
-
-                 This special case is necessary, not an optimization.
-                 (Shifts counts of SI_TYPE_SIZE are undefined.)  */
-
-              n1 -= d0;
-              q1 = 1;
-            }
-          else
-            {
-              _FP_W_TYPE n2;
-
-              /* Normalize.  */
-
-              b = _FP_W_TYPE_SIZE - bm;
-
-              d0 = d0 << bm;
-              n2 = n1 >> b;
-              n1 = (n1 << bm) | (n0 >> b);
-              n0 = n0 << bm;
-
-              udiv_qrnnd (q1, n1, n2, n1, d0);
-            }
-
-          /* n1 != d0...  */
-
-          udiv_qrnnd (q0, n0, n1, n0, d0);
-
-          /* Remainder in n0 >> bm.  */
-        }
-
-      r0 = n0 >> bm;
-      r1 = 0;
-#endif /* UDIV_NEEDS_NORMALIZATION */
-    }
-  else
-    {
-      if (d1 > n1)
-        {
-          /* 00 = nn / DD */
-
-          q0 = 0;
-          q1 = 0;
-
-          /* Remainder in n1n0.  */
-          r0 = n0;
-          r1 = n1;
-        }
-      else
-        {
-          /* 0q = NN / dd */
-
-          count_leading_zeros (bm, d1);
-          if (bm == 0)
-            {
-              /* From (n1 >= d1) /\ (the most significant bit of d1 is set),
-                 conclude (the most significant bit of n1 is set) /\ (the
-                 quotient digit q0 = 0 or 1).
-
-                 This special case is necessary, not an optimization.  */
-
-              /* The condition on the next line takes advantage of that
-                 n1 >= d1 (true due to program flow).  */
-              if (n1 > d1 || n0 >= d0)
-                {
-                  q0 = 1;
-                  sub_ddmmss (n1, n0, n1, n0, d1, d0);
-                }
-              else
-                q0 = 0;
-
-              q1 = 0;
-
-              r0 = n0;
-              r1 = n1;
-            }
-          else
-            {
-              _FP_W_TYPE m1, m0, n2;
-
-              /* Normalize.  */
-
-              b = _FP_W_TYPE_SIZE - bm;
-
-              d1 = (d1 << bm) | (d0 >> b);
-              d0 = d0 << bm;
-              n2 = n1 >> b;
-              n1 = (n1 << bm) | (n0 >> b);
-              n0 = n0 << bm;
-
-              udiv_qrnnd (q0, n1, n2, n1, d1);
-              umul_ppmm (m1, m0, q0, d0);
-
-              if (m1 > n1 || (m1 == n1 && m0 > n0))
-                {
-                  q0--;
-                  sub_ddmmss (m1, m0, m1, m0, d1, d0);
-                }
-
-              q1 = 0;
-
-              /* Remainder in (n1n0 - m1m0) >> bm.  */
-              sub_ddmmss (n1, n0, n1, n0, m1, m0);
-              r0 = (n1 << b) | (n0 >> bm);
-              r1 = n1 >> bm;
-            }
-        }
-    }
-
-  q[0] = q0; q[1] = q1;
-  r[0] = r0, r[1] = r1;
-}
diff --git a/arch/ppc/mm/44x_mmu.c b/arch/ppc/mm/44x_mmu.c
index 3d79ce281b67..e0152a9b26e6 100644
--- a/arch/ppc/mm/44x_mmu.c
+++ b/arch/ppc/mm/44x_mmu.c
@@ -104,7 +104,7 @@ unsigned long __init mmu_mapin_ram(void)
 
         /* Determine number of entries necessary to cover lowmem */
         pinned_tlbs = (unsigned int)
-                (_ALIGN(total_lowmem, PPC44x_PIN_SIZE) >> PPC44x_PIN_SHIFT);
+                (_ALIGN(total_lowmem, PPC_PIN_SIZE) >> PPC44x_PIN_SHIFT);
 
         /* Write upper watermark to save location */
         tlb_44x_hwater = PPC44x_LOW_SLOT - pinned_tlbs;
@@ -112,7 +112,7 @@ unsigned long __init mmu_mapin_ram(void)
         /* If necessary, set additional pinned TLBs */
         if (pinned_tlbs > 1)
                 for (i = (PPC44x_LOW_SLOT-(pinned_tlbs-1)); i < PPC44x_LOW_SLOT; i++) {
-                        unsigned int phys_addr = (PPC44x_LOW_SLOT-i) * PPC44x_PIN_SIZE;
+                        unsigned int phys_addr = (PPC44x_LOW_SLOT-i) * PPC_PIN_SIZE;
                         ppc44x_pin_tlb(i, phys_addr+PAGE_OFFSET, phys_addr);
                 }
 
diff --git a/arch/ppc/mm/fault.c b/arch/ppc/mm/fault.c
index ee5e9f25baf9..8e08ca32531a 100644
--- a/arch/ppc/mm/fault.c
+++ b/arch/ppc/mm/fault.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/mm/fault.c
- *
  *  PowerPC version
  *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
  *
@@ -204,6 +202,7 @@ good_area:
         /* an exec  - 4xx/Book-E allows for per-page execute permission */
         } else if (TRAP(regs) == 0x400) {
                 pte_t *ptep;
+                pmd_t *pmdp;
 
 #if 0
                 /* It would be nice to actually enforce the VM execute
@@ -217,21 +216,24 @@ good_area:
                 /* Since 4xx/Book-E supports per-page execute permission,
                  * we lazily flush dcache to icache. */
                 ptep = NULL;
-                if (get_pteptr(mm, address, &ptep) && pte_present(*ptep)) {
-                        struct page *page = pte_page(*ptep);
-
-                        if (! test_bit(PG_arch_1, &page->flags)) {
-                                flush_dcache_icache_page(page);
-                                set_bit(PG_arch_1, &page->flags);
+                if (get_pteptr(mm, address, &ptep, &pmdp)) {
+                        spinlock_t *ptl = pte_lockptr(mm, pmdp);
+                        spin_lock(ptl);
+                        if (pte_present(*ptep)) {
+                                struct page *page = pte_page(*ptep);
+
+                                if (!test_bit(PG_arch_1, &page->flags)) {
+                                        flush_dcache_icache_page(page);
+                                        set_bit(PG_arch_1, &page->flags);
+                                }
+                                pte_update(ptep, 0, _PAGE_HWEXEC);
+                                _tlbie(address);
+                                pte_unmap_unlock(ptep, ptl);
+                                up_read(&mm->mmap_sem);
+                                return 0;
                         }
-                        pte_update(ptep, 0, _PAGE_HWEXEC);
-                        _tlbie(address);
-                        pte_unmap(ptep);
-                        up_read(&mm->mmap_sem);
-                        return 0;
+                        pte_unmap_unlock(ptep, ptl);
                 }
-                if (ptep != NULL)
-                        pte_unmap(ptep);
 #endif
         /* a read */
         } else {
diff --git a/arch/ppc/mm/hashtable.S b/arch/ppc/mm/hashtable.S
index 3ec87c91343e..31d0a924317c 100644
--- a/arch/ppc/mm/hashtable.S
+++ b/arch/ppc/mm/hashtable.S
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/kernel/hashtable.S
- *
  *  $Id: hashtable.S,v 1.6 1999/10/08 01:56:15 paulus Exp $
  *
  *  PowerPC version
@@ -76,12 +74,6 @@ _GLOBAL(hash_page_sync)
  */
         .text
 _GLOBAL(hash_page)
-#ifdef CONFIG_PPC64BRIDGE
-        mfmsr   r0
-        clrldi  r0,r0,1         /* make sure it's in 32-bit mode */
-        MTMSRD(r0)
-        isync
-#endif
         tophys(r7,0)                    /* gets -KERNELBASE into r7 */
 #ifdef CONFIG_SMP
         addis   r8,r7,mmu_hash_lock@h
@@ -305,7 +297,6 @@ Hash_base = 0xc0180000
 Hash_bits = 12                          /* e.g. 256kB hash table */
 Hash_msk = (((1 << Hash_bits) - 1) * 64)
 
-#ifndef CONFIG_PPC64BRIDGE
 /* defines for the PTE format for 32-bit PPCs */
 #define PTE_SIZE        8
 #define PTEG_SIZE       64
@@ -319,21 +310,6 @@ Hash_msk = (((1 << Hash_bits) - 1) * 64)
 #define SET_V(r)        oris r,r,PTE_V@h
 #define CLR_V(r,t)      rlwinm r,r,0,1,31
 
-#else
-/* defines for the PTE format for 64-bit PPCs */
-#define PTE_SIZE        16
-#define PTEG_SIZE       128
-#define LG_PTEG_SIZE    7
-#define LDPTEu          ldu
-#define STPTE           std
-#define CMPPTE          cmpd
-#define PTE_H           2
-#define PTE_V           1
-#define TST_V(r)        andi. r,r,PTE_V
-#define SET_V(r)        ori r,r,PTE_V
-#define CLR_V(r,t)      li t,PTE_V; andc r,r,t
-#endif /* CONFIG_PPC64BRIDGE */
-
 #define HASH_LEFT       31-(LG_PTEG_SIZE+Hash_bits-1)
 #define HASH_RIGHT      31-LG_PTEG_SIZE
 
@@ -351,14 +327,8 @@ BEGIN_FTR_SECTION
 END_FTR_SECTION_IFSET(CPU_FTR_NEED_COHERENT)
 
         /* Construct the high word of the PPC-style PTE (r5) */
-#ifndef CONFIG_PPC64BRIDGE
         rlwinm  r5,r3,7,1,24            /* put VSID in 0x7fffff80 bits */
         rlwimi  r5,r4,10,26,31          /* put in API (abbrev page index) */
-#else /* CONFIG_PPC64BRIDGE */
-        clrlwi  r3,r3,8                 /* reduce vsid to 24 bits */
-        sldi    r5,r3,12                /* shift vsid into position */
-        rlwimi  r5,r4,16,20,24          /* put in API (abbrev page index) */
-#endif /* CONFIG_PPC64BRIDGE */
         SET_V(r5)                       /* set V (valid) bit */
 
         /* Get the address of the primary PTE group in the hash table (r3) */
@@ -542,14 +512,8 @@ _GLOBAL(flush_hash_pages)
         add     r3,r3,r0                /* note code below trims to 24 bits */
 
         /* Construct the high word of the PPC-style PTE (r11) */
-#ifndef CONFIG_PPC64BRIDGE
         rlwinm  r11,r3,7,1,24           /* put VSID in 0x7fffff80 bits */
         rlwimi  r11,r4,10,26,31         /* put in API (abbrev page index) */
-#else /* CONFIG_PPC64BRIDGE */
-        clrlwi  r3,r3,8                 /* reduce vsid to 24 bits */
-        sldi    r11,r3,12               /* shift vsid into position */
-        rlwimi  r11,r4,16,20,24         /* put in API (abbrev page index) */
-#endif /* CONFIG_PPC64BRIDGE */
         SET_V(r11)                      /* set V (valid) bit */
 
 #ifdef CONFIG_SMP
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 134db5c04203..386e000bcb73 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -140,7 +140,7 @@ static void free_sec(unsigned long start, unsigned long end, const char *name)
 
         while (start < end) {
                 ClearPageReserved(virt_to_page(start));
-                set_page_count(virt_to_page(start), 1);
+                init_page_count(virt_to_page(start));
                 free_page(start);
                 cnt++;
                 start += PAGE_SIZE;
@@ -172,7 +172,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 
         for (; start < end; start += PAGE_SIZE) {
                 ClearPageReserved(virt_to_page(start));
-                set_page_count(virt_to_page(start), 1);
+                init_page_count(virt_to_page(start));
                 free_page(start);
                 totalram_pages++;
         }
@@ -412,14 +412,6 @@ void __init mem_init(void)
         }
 #endif /* CONFIG_BLK_DEV_INITRD */
 
-#ifdef CONFIG_PPC_OF
-        /* mark the RTAS pages as reserved */
-        if ( rtas_data )
-                for (addr = (ulong)__va(rtas_data);
-                     addr < PAGE_ALIGN((ulong)__va(rtas_data)+rtas_size) ;
-                     addr += PAGE_SIZE)
-                        SetPageReserved(virt_to_page(addr));
-#endif
         for (addr = PAGE_OFFSET; addr < (unsigned long)high_memory;
              addr += PAGE_SIZE) {
                 if (!PageReserved(virt_to_page(addr)))
@@ -441,7 +433,7 @@ void __init mem_init(void)
                         struct page *page = mem_map + pfn;
 
                         ClearPageReserved(page);
-                        set_page_count(page, 1);
+                        init_page_count(page);
                         __free_page(page);
                         totalhigh_pages++;
                 }
@@ -494,11 +486,6 @@ set_phys_avail(unsigned long total_memory)
                                   initrd_end - initrd_start, 1);
         }
 #endif /* CONFIG_BLK_DEV_INITRD */
-#ifdef CONFIG_PPC_OF
-        /* remove the RTAS pages from the available memory */
-        if (rtas_data)
-                mem_pieces_remove(&phys_avail, rtas_data, rtas_size, 1);
-#endif
 }
 
 /* Mark some memory as reserved by removing it from phys_avail. */
diff --git a/arch/ppc/mm/mmu_context.c b/arch/ppc/mm/mmu_context.c
index a8816e0f6a86..b4a4b3f02a1c 100644
--- a/arch/ppc/mm/mmu_context.c
+++ b/arch/ppc/mm/mmu_context.c
@@ -2,7 +2,7 @@
  * This file contains the routines for handling the MMU on those
  * PowerPC implementations where the MMU substantially follows the
  * architecture specification.  This includes the 6xx, 7xx, 7xxx,
- * 8260, and POWER3 implementations but excludes the 8xx and 4xx.
+ * 8260, and 83xx implementations but excludes the 8xx and 4xx.
  *  -- paulus
  *
  *  Derived from arch/ppc/mm/init.c:
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c
index 6ea9185fd120..706bca8eb144 100644
--- a/arch/ppc/mm/pgtable.c
+++ b/arch/ppc/mm/pgtable.c
@@ -39,7 +39,7 @@ unsigned long ioremap_base;
 unsigned long ioremap_bot;
 int io_bat_index;
 
-#if defined(CONFIG_6xx) || defined(CONFIG_POWER3)
+#if defined(CONFIG_6xx)
 #define HAVE_BATS       1
 #endif
 
@@ -368,7 +368,7 @@ void __init io_block_mapping(unsigned long virt, phys_addr_t phys,
  * the PTE pointer is unmodified if PTE is not found.
  */
 int
-get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep)
+get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep, pmd_t **pmdp)
 {
         pgd_t   *pgd;
         pmd_t   *pmd;
@@ -383,6 +383,8 @@ get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep)
                         if (pte) {
                                 retval = 1;
                                 *ptep = pte;
+                                if (pmdp)
+                                        *pmdp = pmd;
                                 /* XXX caller needs to do pte_unmap, yuck */
                         }
                 }
@@ -420,7 +422,7 @@ unsigned long iopa(unsigned long addr)
                 mm = &init_mm;
 
         pa = 0;
-        if (get_pteptr(mm, addr, &pte)) {
+        if (get_pteptr(mm, addr, &pte, NULL)) {
                 pa = (pte_val(*pte) & PAGE_MASK) | (addr & ~PAGE_MASK);
                 pte_unmap(pte);
         }
diff --git a/arch/ppc/mm/ppc_mmu.c b/arch/ppc/mm/ppc_mmu.c
index 9a381ed5eb21..25bb6f3347c1 100644
--- a/arch/ppc/mm/ppc_mmu.c
+++ b/arch/ppc/mm/ppc_mmu.c
@@ -2,7 +2,7 @@
  * This file contains the routines for handling the MMU on those
  * PowerPC implementations where the MMU substantially follows the
  * architecture specification.  This includes the 6xx, 7xx, 7xxx,
- * 8260, and POWER3 implementations but excludes the 8xx and 4xx.
+ * 8260, and 83xx implementations but excludes the 8xx and 4xx.
  *  -- paulus
  *
  *  Derived from arch/ppc/mm/init.c:
@@ -42,11 +42,7 @@ unsigned long _SDR1;
 
 union ubat {                    /* BAT register values to be loaded */
         BAT     bat;
-#ifdef CONFIG_PPC64BRIDGE
-        u64     word[2];
-#else
         u32     word[2];
-#endif
 } BATS[4][2];                   /* 4 pairs of IBAT, DBAT */
 
 struct batrange {               /* stores address ranges mapped by BATs */
@@ -83,9 +79,6 @@ unsigned long p_mapped_by_bats(unsigned long pa)
 
 unsigned long __init mmu_mapin_ram(void)
 {
-#ifdef CONFIG_POWER4
-        return 0;
-#else
         unsigned long tot, bl, done;
         unsigned long max_size = (256<<20);
         unsigned long align;
@@ -122,7 +115,6 @@ unsigned long __init mmu_mapin_ram(void)
         }
 
         return done;
-#endif
 }
 
 /*
@@ -205,27 +197,10 @@ void __init MMU_init_hw(void)
 
         if ( ppc_md.progress ) ppc_md.progress("hash:enter", 0x105);
 
-#ifdef CONFIG_PPC64BRIDGE
-#define LG_HPTEG_SIZE   7               /* 128 bytes per HPTEG */
-#define SDR1_LOW_BITS   (lg_n_hpteg - 11)
-#define MIN_N_HPTEG     2048            /* min 256kB hash table */
-#else
 #define LG_HPTEG_SIZE   6               /* 64 bytes per HPTEG */
 #define SDR1_LOW_BITS   ((n_hpteg - 1) >> 10)
 #define MIN_N_HPTEG     1024            /* min 64kB hash table */
-#endif
-
-#ifdef CONFIG_POWER4
-        /* The hash table has already been allocated and initialized
-           in prom.c */
-        n_hpteg = Hash_size >> LG_HPTEG_SIZE;
-        lg_n_hpteg = __ilog2(n_hpteg);
-
-        /* Remove the hash table from the available memory */
-        if (Hash)
-                reserve_phys_mem(__pa(Hash), Hash_size);
 
-#else /* CONFIG_POWER4 */
         /*
          * Allow 1 HPTE (1/8 HPTEG) for each page of memory.
          * This is less than the recommended amount, but then
@@ -248,7 +223,6 @@ void __init MMU_init_hw(void)
         Hash = mem_pieces_find(Hash_size, Hash_size);
         cacheable_memzero(Hash, Hash_size);
         _SDR1 = __pa(Hash) | SDR1_LOW_BITS;
-#endif /* CONFIG_POWER4 */
 
         Hash_end = (PTE *) ((unsigned long)Hash + Hash_size);
 
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
index d8837911bbc6..174ddbc9758b 100644
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -57,6 +57,10 @@ config XILINX_ML300
         help
           This option enables support for the Xilinx ML300 evaluation board.
 
+config XILINX_ML403
+        bool "Xilinx-ML403"
+        help
+          This option enables support for the Xilinx ML403 evaluation board.
 endchoice
 
 choice
@@ -172,11 +176,6 @@ config IBM_OCP
         depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT
         default y
 
-config XILINX_OCP
-        bool
-        depends on XILINX_ML300
-        default y
-
 config IBM_EMAC4
         bool
         depends on 440GX || 440SP || 440SPE
@@ -208,11 +207,21 @@ config 405GPR
         depends on SYCAMORE
         default y
 
-config VIRTEX_II_PRO
+config XILINX_VIRTEX_II_PRO
         bool
         depends on XILINX_ML300
         default y
 
+config XILINX_VIRTEX_4_FX
+        bool
+        depends on XILINX_ML403
+        default y
+
+config XILINX_VIRTEX
+        bool
+        depends on XILINX_VIRTEX_II_PRO || XILINX_VIRTEX_4_FX
+        default y
+
 config STB03xxx
         bool
         depends on REDWOOD_5 || REDWOOD_6
@@ -220,7 +229,7 @@ config STB03xxx
 
 config EMBEDDEDBOOT
         bool
-        depends on EP405 || XILINX_ML300
+        depends on EP405 || XILINX_ML300 || XILINX_ML403
         default y
 
 config IBM_OPENBIOS
diff --git a/arch/ppc/platforms/4xx/Makefile b/arch/ppc/platforms/4xx/Makefile
index c9bb61170954..a04a0d0a0f5c 100644
--- a/arch/ppc/platforms/4xx/Makefile
+++ b/arch/ppc/platforms/4xx/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_REDWOOD_6)		+= redwood6.o
 obj-$(CONFIG_SYCAMORE)          += sycamore.o
 obj-$(CONFIG_WALNUT)            += walnut.o
 obj-$(CONFIG_XILINX_ML300)      += xilinx_ml300.o
+obj-$(CONFIG_XILINX_ML403)      += xilinx_ml403.o
 
 obj-$(CONFIG_405GP)             += ibm405gp.o
 obj-$(CONFIG_REDWOOD_5)         += ibmstb4.o
@@ -26,4 +27,5 @@ obj-$(CONFIG_440SP)		+= ibm440sp.o
 obj-$(CONFIG_440SPE)            += ppc440spe.o
 obj-$(CONFIG_405EP)             += ibm405ep.o
 obj-$(CONFIG_405GPR)            += ibm405gpr.o
-obj-$(CONFIG_VIRTEX_II_PRO)     += virtex-ii_pro.o
+obj-$(CONFIG_XILINX_VIRTEX)     += virtex.o
+
diff --git a/arch/ppc/platforms/4xx/bamboo.c b/arch/ppc/platforms/4xx/bamboo.c
index 0ec53f049338..b940cfd646c2 100644
--- a/arch/ppc/platforms/4xx/bamboo.c
+++ b/arch/ppc/platforms/4xx/bamboo.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/bamboo.c
- *
  * Bamboo board specific routines
  *
  * Wade Farnsworth <wfarnsworth@mvista.com>
diff --git a/arch/ppc/platforms/4xx/bamboo.h b/arch/ppc/platforms/4xx/bamboo.h
index 5c0192826494..31c0dd6a26cb 100644
--- a/arch/ppc/platforms/4xx/bamboo.h
+++ b/arch/ppc/platforms/4xx/bamboo.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/bamboo.h
- *
  * Bamboo board definitions
  *
  * Wade Farnsworth <wfarnsworth@mvista.com>
diff --git a/arch/ppc/platforms/4xx/bubinga.h b/arch/ppc/platforms/4xx/bubinga.h
index b5380cfaf5c0..606aa9fa5caa 100644
--- a/arch/ppc/platforms/4xx/bubinga.h
+++ b/arch/ppc/platforms/4xx/bubinga.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/bubinga.h
- *
  * Bubinga board definitions
  *
  * Copyright (c) 2005 DENX Software Engineering
diff --git a/arch/ppc/platforms/4xx/cpci405.c b/arch/ppc/platforms/4xx/cpci405.c
index ff966773a0bf..6571e39fbe48 100644
--- a/arch/ppc/platforms/4xx/cpci405.c
+++ b/arch/ppc/platforms/4xx/cpci405.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/cpci405.c
- *
  * Board setup routines for the esd CPCI-405 cPCI Board.
  *
  * Author: Stefan Roese
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
index 9a828b623417..b4ecb9c79854 100644
--- a/arch/ppc/platforms/4xx/ebony.c
+++ b/arch/ppc/platforms/4xx/ebony.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ebony.c
- *
  * Ebony board specific routines
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/platforms/4xx/ebony.h b/arch/ppc/platforms/4xx/ebony.h
index b91ad4272dfe..27b2e77c7c83 100644
--- a/arch/ppc/platforms/4xx/ebony.h
+++ b/arch/ppc/platforms/4xx/ebony.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/ebony.h
- *
  * Ebony board definitions
  *
  * Matt Porter <mporter@mvista.com>
diff --git a/arch/ppc/platforms/4xx/ep405.c b/arch/ppc/platforms/4xx/ep405.c
index 26a07cdb30ec..6efa91ff9c07 100644
--- a/arch/ppc/platforms/4xx/ep405.c
+++ b/arch/ppc/platforms/4xx/ep405.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ep405.c
- *
  * Embedded Planet 405GP board
  * http://www.embeddedplanet.com
  *
diff --git a/arch/ppc/platforms/4xx/ep405.h b/arch/ppc/platforms/4xx/ep405.h
index ea3eb21338fb..9814fc431725 100644
--- a/arch/ppc/platforms/4xx/ep405.h
+++ b/arch/ppc/platforms/4xx/ep405.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ep405.h
- *
  * Embedded Planet 405GP board
  * http://www.embeddedplanet.com
  *
diff --git a/arch/ppc/platforms/4xx/ibm405ep.c b/arch/ppc/platforms/4xx/ibm405ep.c
index 093b28d27a41..55af769a6e70 100644
--- a/arch/ppc/platforms/4xx/ibm405ep.c
+++ b/arch/ppc/platforms/4xx/ibm405ep.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/ibm405ep.c
- *
  * Support for IBM PPC 405EP processors.
  *
  * Author: SAW (IBM), derived from ibmnp405l.c.
diff --git a/arch/ppc/platforms/4xx/ibm405ep.h b/arch/ppc/platforms/4xx/ibm405ep.h
index e051e3fe8c63..fe46640de152 100644
--- a/arch/ppc/platforms/4xx/ibm405ep.h
+++ b/arch/ppc/platforms/4xx/ibm405ep.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm405ep.h
- *
  * IBM PPC 405EP processor defines.
  *
  * Author: SAW (IBM), derived from ibm405gp.h.
diff --git a/arch/ppc/platforms/4xx/ibm405gp.h b/arch/ppc/platforms/4xx/ibm405gp.h
index b2b642e81af7..eaf0ef57028d 100644
--- a/arch/ppc/platforms/4xx/ibm405gp.h
+++ b/arch/ppc/platforms/4xx/ibm405gp.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm405gp.h
- *
  * Author: Armin Kuster akuster@mvista.com
  *
  * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/4xx/ibm405gpr.c b/arch/ppc/platforms/4xx/ibm405gpr.c
index cd0d00d8e8ee..49da61f6854a 100644
--- a/arch/ppc/platforms/4xx/ibm405gpr.c
+++ b/arch/ppc/platforms/4xx/ibm405gpr.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm405gpr.c
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/4xx/ibm405gpr.h b/arch/ppc/platforms/4xx/ibm405gpr.h
index 45412fb4368f..e90c5dde01d3 100644
--- a/arch/ppc/platforms/4xx/ibm405gpr.h
+++ b/arch/ppc/platforms/4xx/ibm405gpr.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm405gpr.h
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/4xx/ibm440ep.c b/arch/ppc/platforms/4xx/ibm440ep.c
index 65ac0b9c2d05..1fed6638c81f 100644
--- a/arch/ppc/platforms/4xx/ibm440ep.c
+++ b/arch/ppc/platforms/4xx/ibm440ep.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm440ep.c
- *
  * PPC440EP I/O descriptions
  *
  * Wade Farnsworth <wfarnsworth@mvista.com>
diff --git a/arch/ppc/platforms/4xx/ibm440ep.h b/arch/ppc/platforms/4xx/ibm440ep.h
index 97c80b8e3e10..61717e8a799e 100644
--- a/arch/ppc/platforms/4xx/ibm440ep.h
+++ b/arch/ppc/platforms/4xx/ibm440ep.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm440ep.h
- *
  * PPC440EP definitions
  *
  * Wade Farnsworth <wfarnsworth@mvista.com>
diff --git a/arch/ppc/platforms/4xx/ibm440gp.c b/arch/ppc/platforms/4xx/ibm440gp.c
index d926245e8b3e..b67a72e5c6fe 100644
--- a/arch/ppc/platforms/4xx/ibm440gp.c
+++ b/arch/ppc/platforms/4xx/ibm440gp.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm440gp.c
- *
  * PPC440GP I/O descriptions
  *
  * Matt Porter <mporter@mvista.com>
diff --git a/arch/ppc/platforms/4xx/ibm440gp.h b/arch/ppc/platforms/4xx/ibm440gp.h
index ae1efc03b295..7b2763b6024f 100644
--- a/arch/ppc/platforms/4xx/ibm440gp.h
+++ b/arch/ppc/platforms/4xx/ibm440gp.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm440gp.h
- *
  * PPC440GP definitions
  *
  * Roland Dreier <roland@digitalvampire.org>
diff --git a/arch/ppc/platforms/4xx/ibm440gx.c b/arch/ppc/platforms/4xx/ibm440gx.c
index d24c09ee7b18..685abffcb6ce 100644
--- a/arch/ppc/platforms/4xx/ibm440gx.c
+++ b/arch/ppc/platforms/4xx/ibm440gx.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm440gx.c
- *
  * PPC440GX I/O descriptions
  *
  * Matt Porter <mporter@mvista.com>
diff --git a/arch/ppc/platforms/4xx/ibm440gx.h b/arch/ppc/platforms/4xx/ibm440gx.h
index 0b59d8dcd03c..070a34efe1c7 100644
--- a/arch/ppc/platforms/4xx/ibm440gx.h
+++ b/arch/ppc/platforms/4xx/ibm440gx.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/ibm440gx.h
- *
  * PPC440GX definitions
  *
  * Matt Porter <mporter@mvista.com>
diff --git a/arch/ppc/platforms/4xx/ibm440sp.c b/arch/ppc/platforms/4xx/ibm440sp.c
index 71a0117d3597..de8f7ac5623c 100644
--- a/arch/ppc/platforms/4xx/ibm440sp.c
+++ b/arch/ppc/platforms/4xx/ibm440sp.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm440sp.c
- *
  * PPC440SP I/O descriptions
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/platforms/4xx/ibm440sp.h b/arch/ppc/platforms/4xx/ibm440sp.h
index c71e46a18b9e..77e8bb22c527 100644
--- a/arch/ppc/platforms/4xx/ibm440sp.h
+++ b/arch/ppc/platforms/4xx/ibm440sp.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm440sp.h
- *
  * PPC440SP definitions
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/platforms/4xx/ibmnp405h.c b/arch/ppc/platforms/4xx/ibmnp405h.c
index a477a78f4902..f1dcb0ac15b7 100644
--- a/arch/ppc/platforms/4xx/ibmnp405h.c
+++ b/arch/ppc/platforms/4xx/ibmnp405h.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibmnp405h.c
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2000-2002 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/4xx/ibmnp405h.h b/arch/ppc/platforms/4xx/ibmnp405h.h
index e2c2b06128c8..2c683f6aaa66 100644
--- a/arch/ppc/platforms/4xx/ibmnp405h.h
+++ b/arch/ppc/platforms/4xx/ibmnp405h.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibmnp405h.h
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/4xx/ibmstb4.c b/arch/ppc/platforms/4xx/ibmstb4.c
index 7e33bb635443..799a2eccccc3 100644
--- a/arch/ppc/platforms/4xx/ibmstb4.c
+++ b/arch/ppc/platforms/4xx/ibmstb4.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibmstb4.c
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2000-2001 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/4xx/ibmstb4.h b/arch/ppc/platforms/4xx/ibmstb4.h
index 9f21d4c88a3d..9de426597351 100644
--- a/arch/ppc/platforms/4xx/ibmstb4.h
+++ b/arch/ppc/platforms/4xx/ibmstb4.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibmstb4.h
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/4xx/ibmstbx25.c b/arch/ppc/platforms/4xx/ibmstbx25.c
index b895b9cca57d..090ddcbecc5e 100644
--- a/arch/ppc/platforms/4xx/ibmstbx25.c
+++ b/arch/ppc/platforms/4xx/ibmstbx25.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibmstbx25.c
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2000-2002 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/4xx/ibmstbx25.h b/arch/ppc/platforms/4xx/ibmstbx25.h
index 9a2efc366e9c..6884a49d3482 100644
--- a/arch/ppc/platforms/4xx/ibmstbx25.h
+++ b/arch/ppc/platforms/4xx/ibmstbx25.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibmstbx25.h
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c
index 21d29132aebd..5c37de28e135 100644
--- a/arch/ppc/platforms/4xx/luan.c
+++ b/arch/ppc/platforms/4xx/luan.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/luan.c
- *
  * Luan board specific routines
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/platforms/4xx/luan.h b/arch/ppc/platforms/4xx/luan.h
index bbe7d0766db8..e0db6a810feb 100644
--- a/arch/ppc/platforms/4xx/luan.h
+++ b/arch/ppc/platforms/4xx/luan.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/luan.h
- *
  * Luan board definitions
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c
index 4f355b6acab2..f841972f1fa9 100644
--- a/arch/ppc/platforms/4xx/ocotea.c
+++ b/arch/ppc/platforms/4xx/ocotea.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ocotea.c
- *
  * Ocotea board specific routines
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/platforms/4xx/ocotea.h b/arch/ppc/platforms/4xx/ocotea.h
index 33251153ac5f..7c799a9ff82b 100644
--- a/arch/ppc/platforms/4xx/ocotea.h
+++ b/arch/ppc/platforms/4xx/ocotea.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/ocotea.h
- *
  * Ocotea board definitions
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/platforms/4xx/ppc440spe.c b/arch/ppc/platforms/4xx/ppc440spe.c
index 6139a0b3393e..1be5d1c8e266 100644
--- a/arch/ppc/platforms/4xx/ppc440spe.c
+++ b/arch/ppc/platforms/4xx/ppc440spe.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ppc440spe.c
- *
  * PPC440SPe I/O descriptions
  *
  * Roland Dreier <rolandd@cisco.com>
diff --git a/arch/ppc/platforms/4xx/ppc440spe.h b/arch/ppc/platforms/4xx/ppc440spe.h
index 2216846973b8..d3a620ddcdee 100644
--- a/arch/ppc/platforms/4xx/ppc440spe.h
+++ b/arch/ppc/platforms/4xx/ppc440spe.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm440spe.h
- *
  * PPC440SPe definitions
  *
  * Roland Dreier <rolandd@cisco.com>
diff --git a/arch/ppc/platforms/4xx/redwood5.c b/arch/ppc/platforms/4xx/redwood5.c
index 611ac861804d..53da2b4f7c24 100644
--- a/arch/ppc/platforms/4xx/redwood5.c
+++ b/arch/ppc/platforms/4xx/redwood5.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/redwood5.c
- *
  * Support for the IBM redwood5 eval board file
  *
  * Author: Armin Kuster <akuster@mvista.com>
diff --git a/arch/ppc/platforms/4xx/redwood5.h b/arch/ppc/platforms/4xx/redwood5.h
index 264e34fb3fbd..49edd4818970 100644
--- a/arch/ppc/platforms/4xx/redwood5.h
+++ b/arch/ppc/platforms/4xx/redwood5.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/redwood5.h
- *
  * Macros, definitions, and data structures specific to the IBM PowerPC
  * STB03xxx "Redwood" evaluation board.
  *
diff --git a/arch/ppc/platforms/4xx/redwood6.c b/arch/ppc/platforms/4xx/redwood6.c
index b13116691289..41b27d106fa3 100644
--- a/arch/ppc/platforms/4xx/redwood6.c
+++ b/arch/ppc/platforms/4xx/redwood6.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/redwood6.c
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/4xx/redwood6.h b/arch/ppc/platforms/4xx/redwood6.h
index 1814b9f5fc3a..1edcbe5c51c7 100644
--- a/arch/ppc/platforms/4xx/redwood6.h
+++ b/arch/ppc/platforms/4xx/redwood6.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/redwood6.h
- *
  * Macros, definitions, and data structures specific to the IBM PowerPC
  * STBx25xx "Redwood6" evaluation board.
  *
diff --git a/arch/ppc/platforms/4xx/sycamore.c b/arch/ppc/platforms/4xx/sycamore.c
index 281b4a2ffb96..bab31eb30687 100644
--- a/arch/ppc/platforms/4xx/sycamore.c
+++ b/arch/ppc/platforms/4xx/sycamore.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/sycamore.c
- *
  * Architecture- / platform-specific boot-time initialization code for
  * IBM PowerPC 4xx based boards.
  *
diff --git a/arch/ppc/platforms/4xx/sycamore.h b/arch/ppc/platforms/4xx/sycamore.h
index 1cd6c824fd62..dae01620227d 100644
--- a/arch/ppc/platforms/4xx/sycamore.h
+++ b/arch/ppc/platforms/4xx/sycamore.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/sycamore.h
- *
  * Sycamore board definitions
  *
  * Copyright (c) 2005 DENX Software Engineering
diff --git a/arch/ppc/platforms/4xx/virtex-ii_pro.c b/arch/ppc/platforms/4xx/virtex-ii_pro.c
deleted file mode 100644
index 097cc9d5aca0..000000000000
--- a/arch/ppc/platforms/4xx/virtex-ii_pro.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * arch/ppc/platforms/4xx/virtex-ii_pro.c
- *
- * Author: MontaVista Software, Inc.
- *         source@mvista.com
- *
- * 2002-2004 (c) MontaVista Software, Inc.  This file is licensed under the
- * terms of the GNU General Public License version 2.  This program is licensed
- * "as is" without any warranty of any kind, whether express or implied.
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <asm/ocp.h>
-#include "virtex-ii_pro.h"
-
-/* Have OCP take care of the serial ports. */
-struct ocp_def core_ocp[] = {
-#ifdef XPAR_UARTNS550_0_BASEADDR
-        { .vendor       = OCP_VENDOR_XILINX,
-          .function     = OCP_FUNC_16550,
-          .index        = 0,
-          .paddr        = XPAR_UARTNS550_0_BASEADDR,
-          .irq          = XPAR_INTC_0_UARTNS550_0_VEC_ID,
-          .pm           = OCP_CPM_NA
-        },
-#ifdef XPAR_UARTNS550_1_BASEADDR
-        { .vendor       = OCP_VENDOR_XILINX,
-          .function     = OCP_FUNC_16550,
-          .index        = 1,
-          .paddr        = XPAR_UARTNS550_1_BASEADDR,
-          .irq          = XPAR_INTC_0_UARTNS550_1_VEC_ID,
-          .pm           = OCP_CPM_NA
-        },
-#ifdef XPAR_UARTNS550_2_BASEADDR
-        { .vendor       = OCP_VENDOR_XILINX,
-          .function     = OCP_FUNC_16550,
-          .index        = 2,
-          .paddr        = XPAR_UARTNS550_2_BASEADDR,
-          .irq          = XPAR_INTC_0_UARTNS550_2_VEC_ID,
-          .pm           = OCP_CPM_NA
-        },
-#ifdef XPAR_UARTNS550_3_BASEADDR
-        { .vendor       = OCP_VENDOR_XILINX,
-          .function     = OCP_FUNC_16550,
-          .index        = 3,
-          .paddr        = XPAR_UARTNS550_3_BASEADDR,
-          .irq          = XPAR_INTC_0_UARTNS550_3_VEC_ID,
-          .pm           = OCP_CPM_NA
-        },
-#ifdef XPAR_UARTNS550_4_BASEADDR
-#error Edit this file to add more devices.
-#endif                  /* 4 */
-#endif                  /* 3 */
-#endif                  /* 2 */
-#endif                  /* 1 */
-#endif                  /* 0 */
-        { .vendor       = OCP_VENDOR_INVALID
-        }
-};
diff --git a/arch/ppc/platforms/4xx/virtex-ii_pro.h b/arch/ppc/platforms/4xx/virtex-ii_pro.h
deleted file mode 100644
index 9014c4887339..000000000000
--- a/arch/ppc/platforms/4xx/virtex-ii_pro.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * arch/ppc/platforms/4xx/virtex-ii_pro.h
- *
- * Include file that defines the Xilinx Virtex-II Pro processor
- *
- * Author: MontaVista Software, Inc.
- *         source@mvista.com
- *
- * 2002-2004 (c) MontaVista Software, Inc.  This file is licensed under the
- * terms of the GNU General Public License version 2.  This program is licensed
- * "as is" without any warranty of any kind, whether express or implied.
- */
-
-#ifdef __KERNEL__
-#ifndef __ASM_VIRTEXIIPRO_H__
-#define __ASM_VIRTEXIIPRO_H__
-
-#include <linux/config.h>
-#include <asm/xparameters.h>
-
-/* serial defines */
-
-#define RS_TABLE_SIZE  4        /* change this and add more devices below
-                                   if you have more then 4 16x50 UARTs */
-
-#define BASE_BAUD               (XPAR_UARTNS550_0_CLOCK_FREQ_HZ/16)
-
-/* The serial ports in the Virtex-II Pro have each I/O byte in the
- * LSByte of a word.  This means that iomem_reg_shift needs to be 2 to
- * change the byte offsets into word offsets.  In addition the base
- * addresses need to have 3 added to them to get to the LSByte.
- */
-#define STD_UART_OP(num)                                                 \
-        { 0, BASE_BAUD, 0, XPAR_INTC_0_UARTNS550_##num##_VEC_ID,         \
-                ASYNC_BOOT_AUTOCONF,                                     \
-                .iomem_base = (u8 *)XPAR_UARTNS550_##num##_BASEADDR + 3, \
-                .iomem_reg_shift = 2,                                    \
-                .io_type = SERIAL_IO_MEM},
-
-#if defined(XPAR_INTC_0_UARTNS550_0_VEC_ID)
-#define ML300_UART0 STD_UART_OP(0)
-#else
-#define ML300_UART0
-#endif
-
-#if defined(XPAR_INTC_0_UARTNS550_1_VEC_ID)
-#define ML300_UART1 STD_UART_OP(1)
-#else
-#define ML300_UART1
-#endif
-
-#if defined(XPAR_INTC_0_UARTNS550_2_VEC_ID)
-#define ML300_UART2 STD_UART_OP(2)
-#else
-#define ML300_UART2
-#endif
-
-#if defined(XPAR_INTC_0_UARTNS550_3_VEC_ID)
-#define ML300_UART3 STD_UART_OP(3)
-#else
-#define ML300_UART3
-#endif
-
-#if defined(XPAR_INTC_0_UARTNS550_4_VEC_ID)
-#error Edit this file to add more devices.
-#elif defined(XPAR_INTC_0_UARTNS550_3_VEC_ID)
-#define NR_SER_PORTS    4
-#elif defined(XPAR_INTC_0_UARTNS550_2_VEC_ID)
-#define NR_SER_PORTS    3
-#elif defined(XPAR_INTC_0_UARTNS550_1_VEC_ID)
-#define NR_SER_PORTS    2
-#elif defined(XPAR_INTC_0_UARTNS550_0_VEC_ID)
-#define NR_SER_PORTS    1
-#else
-#define NR_SER_PORTS    0
-#endif
-
-#if defined(CONFIG_UART0_TTYS0)
-#define SERIAL_PORT_DFNS        \
-        ML300_UART0             \
-        ML300_UART1             \
-        ML300_UART2             \
-        ML300_UART3
-#endif
-
-#if defined(CONFIG_UART0_TTYS1)
-#define SERIAL_PORT_DFNS        \
-        ML300_UART1             \
-        ML300_UART0             \
-        ML300_UART2             \
-        ML300_UART3
-#endif
-
-#define DCRN_CPMFR_BASE 0
-
-#include <asm/ibm405.h>
-
-#endif                          /* __ASM_VIRTEXIIPRO_H__ */
-#endif                          /* __KERNEL__ */
diff --git a/arch/ppc/platforms/4xx/virtex.c b/arch/ppc/platforms/4xx/virtex.c
new file mode 100644
index 000000000000..133a83147199
--- /dev/null
+++ b/arch/ppc/platforms/4xx/virtex.c
@@ -0,0 +1,56 @@
+/*
+ * Virtex-II Pro & Virtex-4 FX common infrastructure
+ *
+ * Maintainer: Grant Likely <grant.likely@secretlab.ca>
+ *
+ * Copyright 2005 Secret Lab Technologies Ltd.
+ * Copyright 2005 General Dynamics Canada Ltd.
+ * Copyright 2005 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/serial_8250.h>
+#include <asm/ppc_sys.h>
+#include <platforms/4xx/virtex.h>
+#include <platforms/4xx/xparameters/xparameters.h>
+
+#define XPAR_UART(num) { \
+                .mapbase  = XPAR_UARTNS550_##num##_BASEADDR + 3, \
+                .irq      = XPAR_INTC_0_UARTNS550_##num##_VEC_ID, \
+                .iotype   = UPIO_MEM, \
+                .uartclk  = XPAR_UARTNS550_##num##_CLOCK_FREQ_HZ, \
+                .flags    = UPF_BOOT_AUTOCONF, \
+                .regshift = 2, \
+        }
+
+struct plat_serial8250_port serial_platform_data[] = {
+#ifdef XPAR_UARTNS550_0_BASEADDR
+        XPAR_UART(0),
+#endif
+#ifdef XPAR_UARTNS550_1_BASEADDR
+        XPAR_UART(1),
+#endif
+#ifdef XPAR_UARTNS550_2_BASEADDR
+        XPAR_UART(2),
+#endif
+#ifdef XPAR_UARTNS550_3_BASEADDR
+        XPAR_UART(3),
+#endif
+        { }, /* terminated by empty record */
+};
+
+struct platform_device ppc_sys_platform_devices[] = {
+        [VIRTEX_UART] = {
+                .name           = "serial8250",
+                .id             = 0,
+                .dev.platform_data = serial_platform_data,
+        },
+};
+
diff --git a/arch/ppc/platforms/4xx/virtex.h b/arch/ppc/platforms/4xx/virtex.h
new file mode 100644
index 000000000000..c14325dfd7b1
--- /dev/null
+++ b/arch/ppc/platforms/4xx/virtex.h
@@ -0,0 +1,35 @@
+/*
+ * arch/ppc/platforms/4xx/virtex.h
+ *
+ * Include file that defines the Xilinx Virtex-II Pro processor
+ *
+ * Author: MontaVista Software, Inc.
+ *         source@mvista.com
+ *
+ * 2002-2004 (c) MontaVista Software, Inc.  This file is licensed under the
+ * terms of the GNU General Public License version 2.  This program is licensed
+ * "as is" without any warranty of any kind, whether express or implied.
+ */
+
+#ifdef __KERNEL__
+#ifndef __ASM_VIRTEX_H__
+#define __ASM_VIRTEX_H__
+
+/* serial defines */
+
+#include <asm/ibm405.h>
+
+/* Ugly, ugly, ugly! BASE_BAUD defined here to keep 8250.c happy. */
+#if !defined(BASE_BAUD)
+ #define BASE_BAUD              (0) /* dummy value; not used */
+#endif
+  
+/* Device type enumeration for platform bus definitions */
+#ifndef __ASSEMBLY__
+enum ppc_sys_devices {
+        VIRTEX_UART, NUM_PPC_SYS_DEVS,
+};
+#endif
+  
+#endif                          /* __ASM_VIRTEX_H__ */
+#endif                          /* __KERNEL__ */
diff --git a/arch/ppc/platforms/4xx/walnut.c b/arch/ppc/platforms/4xx/walnut.c
index 74cb33182d9f..6bd77902b9a4 100644
--- a/arch/ppc/platforms/4xx/walnut.c
+++ b/arch/ppc/platforms/4xx/walnut.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/walnut.c
- *
  * Architecture- / platform-specific boot-time initialization code for
  * IBM PowerPC 4xx based boards. Adapted from original
  * code by Gary Thomas, Cort Dougan <cort@fsmlabs.com>, and Dan Malek
diff --git a/arch/ppc/platforms/4xx/walnut.h b/arch/ppc/platforms/4xx/walnut.h
index dcf2691698c0..f13a577f0a41 100644
--- a/arch/ppc/platforms/4xx/walnut.h
+++ b/arch/ppc/platforms/4xx/walnut.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/walnut.h
- *
  * Walnut board definitions
  *
  * Copyright (c) 2005 DENX Software Engineering
diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.c b/arch/ppc/platforms/4xx/xilinx_ml300.c
index e90d97f64f76..d97a7f269f97 100644
--- a/arch/ppc/platforms/4xx/xilinx_ml300.c
+++ b/arch/ppc/platforms/4xx/xilinx_ml300.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/xilinx_ml300.c
- *
  * Xilinx ML300 evaluation board initialization
  *
  * Author: MontaVista Software, Inc.
@@ -17,12 +15,14 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/serialP.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/ocp.h>
+#include <asm/ppc_sys.h>
 
-#include <platforms/4xx/virtex-ii_pro.h>        /* for NR_SER_PORTS */
+#include <syslib/gen550.h>
+#include <platforms/4xx/xparameters/xparameters.h>
 
 /*
  * As an overview of how the following functions (platform_init,
@@ -54,6 +54,22 @@
  *          ppc4xx_pic_init                     arch/ppc/syslib/xilinx_pic.c
  */
 
+/* Board specifications structures */
+struct ppc_sys_spec *cur_ppc_sys_spec;
+struct ppc_sys_spec ppc_sys_specs[] = {
+        {
+                /* Only one entry, always assume the same design */
+                .ppc_sys_name   = "Xilinx ML300 Reference Design",
+                .mask           = 0x00000000,
+                .value          = 0x00000000,
+                .num_devices    = 1,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        VIRTEX_UART,
+                },
+        },
+};
+
 #if defined(XPAR_POWER_0_POWERDOWN_BASEADDR)
 
 static volatile unsigned *powerdown_base =
@@ -80,28 +96,39 @@ ml300_map_io(void)
 #endif
 }
 
+/* Early serial support functions */
 static void __init
+ml300_early_serial_init(int num, struct plat_serial8250_port *pdata)
+{
+#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
+        struct uart_port serial_req;
+
+        memset(&serial_req, 0, sizeof(serial_req));
+        serial_req.mapbase      = pdata->mapbase;
+        serial_req.membase      = pdata->membase;
+        serial_req.irq          = pdata->irq;
+        serial_req.uartclk      = pdata->uartclk;
+        serial_req.regshift     = pdata->regshift;
+        serial_req.iotype       = pdata->iotype;
+        serial_req.flags        = pdata->flags;
+        gen550_init(num, &serial_req);
+#endif
+}
+
+void __init
 ml300_early_serial_map(void)
 {
 #ifdef CONFIG_SERIAL_8250
-        struct serial_state old_ports[] = { SERIAL_PORT_DFNS };
-        struct uart_port port;
-        int i;
-
-        /* Setup ioremapped serial port access */
-        for (i = 0; i < ARRAY_SIZE(old_ports); i++ ) {
-                memset(&port, 0, sizeof(port));
-                port.membase = ioremap((phys_addr_t)(old_ports[i].iomem_base), 16);
-                port.irq = old_ports[i].irq;
-                port.uartclk = old_ports[i].baud_base * 16;
-                port.regshift = old_ports[i].iomem_reg_shift;
-                port.iotype = UPIO_MEM;
-                port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
-                port.line = i;
-
-                if (early_serial_setup(&port) != 0) {
-                        printk("Early serial init of port %d failed\n", i);
-                }
+        struct plat_serial8250_port *pdata;
+        int i = 0;
+
+        pdata = (struct plat_serial8250_port *) ppc_sys_get_pdata(VIRTEX_UART);
+        while(pdata && pdata->flags)
+        {
+                pdata->membase = ioremap(pdata->mapbase, 0x100);
+                ml300_early_serial_init(i, pdata);
+                pdata++;
+                i++;
         }
 #endif /* CONFIG_SERIAL_8250 */
 }
@@ -109,9 +136,8 @@ ml300_early_serial_map(void)
 void __init
 ml300_setup_arch(void)
 {
-        ppc4xx_setup_arch();    /* calls ppc4xx_find_bridges() */
-
         ml300_early_serial_map();
+        ppc4xx_setup_arch();    /* calls ppc4xx_find_bridges() */
 
         /* Identify the system */
         printk(KERN_INFO "Xilinx Virtex-II Pro port\n");
@@ -131,6 +157,8 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 {
         ppc4xx_init(r3, r4, r5, r6, r7);
 
+        identify_ppc_sys_by_id(mfspr(SPRN_PVR));
+
         ppc_md.setup_arch = ml300_setup_arch;
         ppc_md.setup_io_mappings = ml300_map_io;
         ppc_md.init_IRQ = ml300_init_irq;
diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.h b/arch/ppc/platforms/4xx/xilinx_ml300.h
index f8c588412336..3d57332ba820 100644
--- a/arch/ppc/platforms/4xx/xilinx_ml300.h
+++ b/arch/ppc/platforms/4xx/xilinx_ml300.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/xilinx_ml300.h
- *
  * Include file that defines the Xilinx ML300 evaluation board
  *
  * Author: MontaVista Software, Inc.
@@ -16,7 +14,7 @@
 #define __ASM_XILINX_ML300_H__
 
 /* ML300 has a Xilinx Virtex-II Pro processor */
-#include <platforms/4xx/virtex-ii_pro.h>
+#include <platforms/4xx/virtex.h>
 
 #ifndef __ASSEMBLY__
 
@@ -41,7 +39,7 @@ typedef struct board_info {
 #define PPC4xx_ONB_IO_VADDR     0u
 #define PPC4xx_ONB_IO_SIZE      0u
 
-#define PPC4xx_MACHINE_NAME "Xilinx ML300"
+#define PPC4xx_MACHINE_NAME "Xilinx ML300 Reference System"
 
 #endif /* __ASM_XILINX_ML300_H__ */
 #endif /* __KERNEL__ */
diff --git a/arch/ppc/platforms/4xx/xilinx_ml403.c b/arch/ppc/platforms/4xx/xilinx_ml403.c
new file mode 100644
index 000000000000..4c0c7e4c1114
--- /dev/null
+++ b/arch/ppc/platforms/4xx/xilinx_ml403.c
@@ -0,0 +1,177 @@
+/*
+ * arch/ppc/platforms/4xx/xilinx_ml403.c
+ *
+ * Xilinx ML403 evaluation board initialization
+ *
+ * Author: Grant Likely <grant.likely@secretlab.ca>
+ *
+ * 2005 (c) Secret Lab Technologies Ltd.
+ * 2002-2004 (c) MontaVista Software, Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/tty.h>
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+#include <linux/serial_8250.h>
+#include <linux/serialP.h>
+#include <asm/io.h>
+#include <asm/machdep.h>
+#include <asm/ppc_sys.h>
+
+#include <syslib/gen550.h>
+#include <platforms/4xx/xparameters/xparameters.h>
+
+/*
+ * As an overview of how the following functions (platform_init,
+ * ml403_map_io, ml403_setup_arch and ml403_init_IRQ) fit into the
+ * kernel startup procedure, here's a call tree:
+ *
+ * start_here                                   arch/ppc/kernel/head_4xx.S
+ *  early_init                                  arch/ppc/kernel/setup.c
+ *  machine_init                                arch/ppc/kernel/setup.c
+ *    platform_init                             this file
+ *      ppc4xx_init                             arch/ppc/syslib/ppc4xx_setup.c
+ *        parse_bootinfo
+ *          find_bootinfo
+ *        "setup some default ppc_md pointers"
+ *  MMU_init                                    arch/ppc/mm/init.c
+ *    *ppc_md.setup_io_mappings == ml403_map_io this file
+ *      ppc4xx_map_io                           arch/ppc/syslib/ppc4xx_setup.c
+ *  start_kernel                                init/main.c
+ *    setup_arch                                arch/ppc/kernel/setup.c
+ * #if defined(CONFIG_KGDB)
+ *      *ppc_md.kgdb_map_scc() == gen550_kgdb_map_scc
+ * #endif
+ *      *ppc_md.setup_arch == ml403_setup_arch  this file
+ *        ppc4xx_setup_arch                     arch/ppc/syslib/ppc4xx_setup.c
+ *          ppc4xx_find_bridges                 arch/ppc/syslib/ppc405_pci.c
+ *    init_IRQ                                  arch/ppc/kernel/irq.c
+ *      *ppc_md.init_IRQ == ml403_init_IRQ      this file
+ *        ppc4xx_init_IRQ                       arch/ppc/syslib/ppc4xx_setup.c
+ *          ppc4xx_pic_init                     arch/ppc/syslib/xilinx_pic.c
+ */
+
+/* Board specifications structures */
+struct ppc_sys_spec *cur_ppc_sys_spec;
+struct ppc_sys_spec ppc_sys_specs[] = {
+        {
+                /* Only one entry, always assume the same design */
+                .ppc_sys_name   = "Xilinx ML403 Reference Design",
+                .mask           = 0x00000000,
+                .value          = 0x00000000,
+                .num_devices    = 1,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        VIRTEX_UART,
+                },
+        },
+};
+
+#if defined(XPAR_POWER_0_POWERDOWN_BASEADDR)
+
+static volatile unsigned *powerdown_base =
+    (volatile unsigned *) XPAR_POWER_0_POWERDOWN_BASEADDR;
+
+static void
+xilinx_power_off(void)
+{
+        local_irq_disable();
+        out_be32(powerdown_base, XPAR_POWER_0_POWERDOWN_VALUE);
+        while (1) ;
+}
+#endif
+
+void __init
+ml403_map_io(void)
+{
+        ppc4xx_map_io();
+
+#if defined(XPAR_POWER_0_POWERDOWN_BASEADDR)
+        powerdown_base = ioremap((unsigned long) powerdown_base,
+                                 XPAR_POWER_0_POWERDOWN_HIGHADDR -
+                                 XPAR_POWER_0_POWERDOWN_BASEADDR + 1);
+#endif
+}
+
+/* Early serial support functions */
+static void __init
+ml403_early_serial_init(int num, struct plat_serial8250_port *pdata)
+{
+#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
+        struct uart_port serial_req;
+
+        memset(&serial_req, 0, sizeof(serial_req));
+        serial_req.mapbase      = pdata->mapbase;
+        serial_req.membase      = pdata->membase;
+        serial_req.irq          = pdata->irq;
+        serial_req.uartclk      = pdata->uartclk;
+        serial_req.regshift     = pdata->regshift;
+        serial_req.iotype       = pdata->iotype;
+        serial_req.flags        = pdata->flags;
+        gen550_init(num, &serial_req);
+#endif
+}
+
+void __init
+ml403_early_serial_map(void)
+{
+#ifdef CONFIG_SERIAL_8250
+        struct plat_serial8250_port *pdata;
+        int i = 0;
+
+        pdata = (struct plat_serial8250_port *) ppc_sys_get_pdata(VIRTEX_UART);
+        while(pdata && pdata->flags)
+        {
+                pdata->membase = ioremap(pdata->mapbase, 0x100);
+                ml403_early_serial_init(i, pdata);
+                pdata++;
+                i++;
+        }
+#endif /* CONFIG_SERIAL_8250 */
+}
+
+void __init
+ml403_setup_arch(void)
+{
+        ml403_early_serial_map();
+        ppc4xx_setup_arch();    /* calls ppc4xx_find_bridges() */
+
+        /* Identify the system */
+        printk(KERN_INFO "Xilinx ML403 Reference System (Virtex-4 FX)\n");
+}
+
+/* Called after board_setup_irq from ppc4xx_init_IRQ(). */
+void __init
+ml403_init_irq(void)
+{
+        ppc4xx_init_IRQ();
+}
+
+void __init
+platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+              unsigned long r6, unsigned long r7)
+{
+        ppc4xx_init(r3, r4, r5, r6, r7);
+
+        identify_ppc_sys_by_id(mfspr(SPRN_PVR));
+
+        ppc_md.setup_arch = ml403_setup_arch;
+        ppc_md.setup_io_mappings = ml403_map_io;
+        ppc_md.init_IRQ = ml403_init_irq;
+
+#if defined(XPAR_POWER_0_POWERDOWN_BASEADDR)
+        ppc_md.power_off = xilinx_power_off;
+#endif
+
+#ifdef CONFIG_KGDB
+        ppc_md.early_serial_map = ml403_early_serial_map;
+#endif
+}
+
diff --git a/arch/ppc/platforms/4xx/xilinx_ml403.h b/arch/ppc/platforms/4xx/xilinx_ml403.h
new file mode 100644
index 000000000000..473596959902
--- /dev/null
+++ b/arch/ppc/platforms/4xx/xilinx_ml403.h
@@ -0,0 +1,49 @@
+/*
+ * arch/ppc/platforms/4xx/xilinx_ml403.h
+ *
+ * Include file that defines the Xilinx ML403 reference design
+ *
+ * Author: Grant Likely <grant.likely@secretlab.ca>
+ *
+ * 2005 (c) Secret Lab Technologies Ltd.
+ * 2002-2004 (c) MontaVista Software, Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#ifdef __KERNEL__
+#ifndef __ASM_XILINX_ML403_H__
+#define __ASM_XILINX_ML403_H__
+
+/* ML403 has a Xilinx Virtex-4 FPGA with a PPC405 hard core */
+#include <platforms/4xx/virtex.h>
+
+#ifndef __ASSEMBLY__
+
+#include <linux/types.h>
+
+typedef struct board_info {
+        unsigned int     bi_memsize;            /* DRAM installed, in bytes */
+        unsigned char    bi_enetaddr[6];        /* Local Ethernet MAC address */
+        unsigned int     bi_intfreq;            /* Processor speed, in Hz */
+        unsigned int     bi_busfreq;            /* PLB Bus speed, in Hz */
+        unsigned int     bi_pci_busfreq;        /* PCI Bus speed, in Hz */
+} bd_t;
+
+/* Some 4xx parts use a different timebase frequency from the internal clock.
+*/
+#define bi_tbfreq bi_intfreq
+
+#endif /* !__ASSEMBLY__ */
+
+/* We don't need anything mapped.  Size of zero will accomplish that. */
+#define PPC4xx_ONB_IO_PADDR     0u
+#define PPC4xx_ONB_IO_VADDR     0u
+#define PPC4xx_ONB_IO_SIZE      0u
+
+#define PPC4xx_MACHINE_NAME "Xilinx ML403 Reference Design"
+
+#endif /* __ASM_XILINX_ML403_H__ */
+#endif /* __KERNEL__ */
diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters.h b/arch/ppc/platforms/4xx/xparameters/xparameters.h
new file mode 100644
index 000000000000..4cf21f256356
--- /dev/null
+++ b/arch/ppc/platforms/4xx/xparameters/xparameters.h
@@ -0,0 +1,37 @@
+/*
+ * include/asm-ppc/xparameters.h
+ *
+ * This file includes the correct xparameters.h for the CONFIG'ed board plus
+ * fixups to translate board specific XPAR values to a common set of names
+ *
+ * Author: MontaVista Software, Inc.
+ *         source@mvista.com
+ *
+ * 2004 (c) MontaVista Software, Inc.  This file is licensed under the terms
+ * of the GNU General Public License version 2.  This program is licensed
+ * "as is" without any warranty of any kind, whether express or implied.
+ */
+
+#include <linux/config.h>
+
+#if defined(CONFIG_XILINX_ML300)
+  #include "xparameters_ml300.h"
+#elif defined(CONFIG_XILINX_ML403)
+  #include "xparameters_ml403.h"
+#else
+  /* Add other board xparameter includes here before the #else */
+  #error No xparameters_*.h file included
+#endif
+
+#ifndef SERIAL_PORT_DFNS
+  /* zImage serial port definitions */
+  #define RS_TABLE_SIZE 1
+  #define SERIAL_PORT_DFNS {                                            \
+        .baud_base       = XPAR_UARTNS550_0_CLOCK_FREQ_HZ/16,           \
+        .irq             = XPAR_INTC_0_UARTNS550_0_VEC_ID,              \
+        .flags           = ASYNC_BOOT_AUTOCONF,                         \
+        .iomem_base      = (u8 *)XPAR_UARTNS550_0_BASEADDR + 3,         \
+        .iomem_reg_shift = 2,                                           \
+        .io_type         = SERIAL_IO_MEM,                               \
+  },
+#endif
diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h b/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h
new file mode 100644
index 000000000000..5cacdcb3964d
--- /dev/null
+++ b/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h
@@ -0,0 +1,243 @@
+
+/*******************************************************************
+*
+* CAUTION: This file is automatically generated by libgen.
+* Version: Xilinx EDK 7.1.2 EDK_H.12.5.1
+* DO NOT EDIT.
+*
+* Copyright (c) 2005 Xilinx, Inc.  All rights reserved. 
+* 
+* Description: Driver parameters
+*
+*******************************************************************/
+
+#define XPAR_PLB_BRAM_IF_CNTLR_0_BASEADDR 0xFFFF0000
+#define XPAR_PLB_BRAM_IF_CNTLR_0_HIGHADDR 0xFFFFFFFF
+
+/******************************************************************/
+
+#define XPAR_OPB_EMC_0_MEM0_BASEADDR 0x20000000
+#define XPAR_OPB_EMC_0_MEM0_HIGHADDR 0x200FFFFF
+#define XPAR_OPB_EMC_0_MEM1_BASEADDR 0x28000000
+#define XPAR_OPB_EMC_0_MEM1_HIGHADDR 0x287FFFFF
+#define XPAR_OPB_AC97_CONTROLLER_REF_0_BASEADDR 0xA6000000
+#define XPAR_OPB_AC97_CONTROLLER_REF_0_HIGHADDR 0xA60000FF
+#define XPAR_OPB_EMC_USB_0_MEM0_BASEADDR 0xA5000000
+#define XPAR_OPB_EMC_USB_0_MEM0_HIGHADDR 0xA50000FF
+#define XPAR_PLB_DDR_0_MEM0_BASEADDR 0x00000000
+#define XPAR_PLB_DDR_0_MEM0_HIGHADDR 0x0FFFFFFF
+
+/******************************************************************/
+
+#define XPAR_XEMAC_NUM_INSTANCES 1
+#define XPAR_OPB_ETHERNET_0_BASEADDR 0x60000000
+#define XPAR_OPB_ETHERNET_0_HIGHADDR 0x60003FFF
+#define XPAR_OPB_ETHERNET_0_DEVICE_ID 0
+#define XPAR_OPB_ETHERNET_0_ERR_COUNT_EXIST 1
+#define XPAR_OPB_ETHERNET_0_DMA_PRESENT 1
+#define XPAR_OPB_ETHERNET_0_MII_EXIST 1
+
+/******************************************************************/
+
+#define XPAR_XUARTNS550_NUM_INSTANCES 1
+#define XPAR_XUARTNS550_CLOCK_HZ 100000000
+#define XPAR_OPB_UART16550_0_BASEADDR 0xA0000000
+#define XPAR_OPB_UART16550_0_HIGHADDR 0xA0001FFF
+#define XPAR_OPB_UART16550_0_DEVICE_ID 0
+
+/******************************************************************/
+
+#define XPAR_XGPIO_NUM_INSTANCES 3
+#define XPAR_OPB_GPIO_0_BASEADDR 0x90000000
+#define XPAR_OPB_GPIO_0_HIGHADDR 0x900001FF
+#define XPAR_OPB_GPIO_0_DEVICE_ID 0
+#define XPAR_OPB_GPIO_0_INTERRUPT_PRESENT 0
+#define XPAR_OPB_GPIO_0_IS_DUAL 1
+#define XPAR_OPB_GPIO_EXP_HDR_0_BASEADDR 0x90001000
+#define XPAR_OPB_GPIO_EXP_HDR_0_HIGHADDR 0x900011FF
+#define XPAR_OPB_GPIO_EXP_HDR_0_DEVICE_ID 1
+#define XPAR_OPB_GPIO_EXP_HDR_0_INTERRUPT_PRESENT 0
+#define XPAR_OPB_GPIO_EXP_HDR_0_IS_DUAL 1
+#define XPAR_OPB_GPIO_CHAR_LCD_0_BASEADDR 0x90002000
+#define XPAR_OPB_GPIO_CHAR_LCD_0_HIGHADDR 0x900021FF
+#define XPAR_OPB_GPIO_CHAR_LCD_0_DEVICE_ID 2
+#define XPAR_OPB_GPIO_CHAR_LCD_0_INTERRUPT_PRESENT 0
+#define XPAR_OPB_GPIO_CHAR_LCD_0_IS_DUAL 0
+
+/******************************************************************/
+
+#define XPAR_XPS2_NUM_INSTANCES 2
+#define XPAR_OPB_PS2_DUAL_REF_0_DEVICE_ID_0 0
+#define XPAR_OPB_PS2_DUAL_REF_0_BASEADDR_0 0xA9000000
+#define XPAR_OPB_PS2_DUAL_REF_0_HIGHADDR_0 (0xA9000000+0x3F)
+#define XPAR_OPB_PS2_DUAL_REF_0_DEVICE_ID_1 1
+#define XPAR_OPB_PS2_DUAL_REF_0_BASEADDR_1 (0xA9000000+0x1000)
+#define XPAR_OPB_PS2_DUAL_REF_0_HIGHADDR_1 (0xA9000000+0x103F)
+
+/******************************************************************/
+
+#define XPAR_XIIC_NUM_INSTANCES 1
+#define XPAR_OPB_IIC_0_BASEADDR 0xA8000000
+#define XPAR_OPB_IIC_0_HIGHADDR 0xA80001FF
+#define XPAR_OPB_IIC_0_DEVICE_ID 0
+#define XPAR_OPB_IIC_0_TEN_BIT_ADR 0
+#define XPAR_OPB_IIC_0_GPO_WIDTH 1
+
+/******************************************************************/
+
+#define XPAR_INTC_MAX_NUM_INTR_INPUTS 10
+#define XPAR_XINTC_HAS_IPR 1
+#define XPAR_XINTC_USE_DCR 0
+#define XPAR_XINTC_NUM_INSTANCES 1
+#define XPAR_OPB_INTC_0_BASEADDR 0xD1000FC0
+#define XPAR_OPB_INTC_0_HIGHADDR 0xD1000FDF
+#define XPAR_OPB_INTC_0_DEVICE_ID 0
+#define XPAR_OPB_INTC_0_KIND_OF_INTR 0x00000000
+
+/******************************************************************/
+
+#define XPAR_INTC_SINGLE_BASEADDR 0xD1000FC0
+#define XPAR_INTC_SINGLE_HIGHADDR 0xD1000FDF
+#define XPAR_INTC_SINGLE_DEVICE_ID XPAR_OPB_INTC_0_DEVICE_ID
+#define XPAR_OPB_ETHERNET_0_IP2INTC_IRPT_MASK 0X000001
+#define XPAR_OPB_INTC_0_OPB_ETHERNET_0_IP2INTC_IRPT_INTR 0
+#define XPAR_SYSTEM_USB_HPI_INT_MASK 0X000002
+#define XPAR_OPB_INTC_0_SYSTEM_USB_HPI_INT_INTR 1
+#define XPAR_MISC_LOGIC_0_PHY_MII_INT_MASK 0X000004
+#define XPAR_OPB_INTC_0_MISC_LOGIC_0_PHY_MII_INT_INTR 2
+#define XPAR_OPB_SYSACE_0_SYSACE_IRQ_MASK 0X000008
+#define XPAR_OPB_INTC_0_OPB_SYSACE_0_SYSACE_IRQ_INTR 3
+#define XPAR_OPB_AC97_CONTROLLER_REF_0_RECORD_INTERRUPT_MASK 0X000010
+#define XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_0_RECORD_INTERRUPT_INTR 4
+#define XPAR_OPB_AC97_CONTROLLER_REF_0_PLAYBACK_INTERRUPT_MASK 0X000020
+#define XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_0_PLAYBACK_INTERRUPT_INTR 5
+#define XPAR_OPB_IIC_0_IP2INTC_IRPT_MASK 0X000040
+#define XPAR_OPB_INTC_0_OPB_IIC_0_IP2INTC_IRPT_INTR 6
+#define XPAR_OPB_PS2_DUAL_REF_0_SYS_INTR2_MASK 0X000080
+#define XPAR_OPB_INTC_0_OPB_PS2_DUAL_REF_0_SYS_INTR2_INTR 7
+#define XPAR_OPB_PS2_DUAL_REF_0_SYS_INTR1_MASK 0X000100
+#define XPAR_OPB_INTC_0_OPB_PS2_DUAL_REF_0_SYS_INTR1_INTR 8
+#define XPAR_OPB_UART16550_0_IP2INTC_IRPT_MASK 0X000200
+#define XPAR_OPB_INTC_0_OPB_UART16550_0_IP2INTC_IRPT_INTR 9
+
+/******************************************************************/
+
+#define XPAR_XTFT_NUM_INSTANCES 1
+#define XPAR_PLB_TFT_CNTLR_REF_0_DCR_BASEADDR 0xD0000200
+#define XPAR_PLB_TFT_CNTLR_REF_0_DCR_HIGHADDR 0xD0000207
+#define XPAR_PLB_TFT_CNTLR_REF_0_DEVICE_ID 0
+
+/******************************************************************/
+
+#define XPAR_XSYSACE_MEM_WIDTH 16
+#define XPAR_XSYSACE_NUM_INSTANCES 1
+#define XPAR_OPB_SYSACE_0_BASEADDR 0xCF000000
+#define XPAR_OPB_SYSACE_0_HIGHADDR 0xCF0001FF
+#define XPAR_OPB_SYSACE_0_DEVICE_ID 0
+#define XPAR_OPB_SYSACE_0_MEM_WIDTH 16
+
+/******************************************************************/
+
+#define XPAR_CPU_PPC405_CORE_CLOCK_FREQ_HZ 300000000
+
+/******************************************************************/
+
+
+/******************************************************************/
+
+/* Linux Redefines */
+
+/******************************************************************/
+
+#define XPAR_UARTNS550_0_BASEADDR (XPAR_OPB_UART16550_0_BASEADDR+0x1000)
+#define XPAR_UARTNS550_0_HIGHADDR XPAR_OPB_UART16550_0_HIGHADDR
+#define XPAR_UARTNS550_0_CLOCK_FREQ_HZ XPAR_XUARTNS550_CLOCK_HZ
+#define XPAR_UARTNS550_0_DEVICE_ID XPAR_OPB_UART16550_0_DEVICE_ID
+
+/******************************************************************/
+
+#define XPAR_INTC_0_BASEADDR XPAR_OPB_INTC_0_BASEADDR
+#define XPAR_INTC_0_HIGHADDR XPAR_OPB_INTC_0_HIGHADDR
+#define XPAR_INTC_0_KIND_OF_INTR XPAR_OPB_INTC_0_KIND_OF_INTR
+#define XPAR_INTC_0_DEVICE_ID XPAR_OPB_INTC_0_DEVICE_ID
+
+/******************************************************************/
+
+#define XPAR_INTC_0_EMAC_0_VEC_ID XPAR_OPB_INTC_0_OPB_ETHERNET_0_IP2INTC_IRPT_INTR
+#define XPAR_INTC_0_SYSACE_0_VEC_ID XPAR_OPB_INTC_0_OPB_SYSACE_0_SYSACE_IRQ_INTR
+#define XPAR_INTC_0_IIC_0_VEC_ID XPAR_OPB_INTC_0_OPB_IIC_0_IP2INTC_IRPT_INTR
+#define XPAR_INTC_0_PS2_1_VEC_ID XPAR_OPB_INTC_0_OPB_PS2_DUAL_REF_0_SYS_INTR2_INTR
+#define XPAR_INTC_0_PS2_0_VEC_ID XPAR_OPB_INTC_0_OPB_PS2_DUAL_REF_0_SYS_INTR1_INTR
+#define XPAR_INTC_0_UARTNS550_0_VEC_ID XPAR_OPB_INTC_0_OPB_UART16550_0_IP2INTC_IRPT_INTR
+
+/******************************************************************/
+
+#define XPAR_TFT_0_BASEADDR XPAR_PLB_TFT_CNTLR_REF_0_DCR_BASEADDR
+
+/******************************************************************/
+
+#define XPAR_EMAC_0_BASEADDR XPAR_OPB_ETHERNET_0_BASEADDR
+#define XPAR_EMAC_0_HIGHADDR XPAR_OPB_ETHERNET_0_HIGHADDR
+#define XPAR_EMAC_0_DMA_PRESENT XPAR_OPB_ETHERNET_0_DMA_PRESENT
+#define XPAR_EMAC_0_MII_EXIST XPAR_OPB_ETHERNET_0_MII_EXIST
+#define XPAR_EMAC_0_ERR_COUNT_EXIST XPAR_OPB_ETHERNET_0_ERR_COUNT_EXIST
+#define XPAR_EMAC_0_DEVICE_ID XPAR_OPB_ETHERNET_0_DEVICE_ID
+
+/******************************************************************/
+
+#define XPAR_GPIO_0_BASEADDR XPAR_OPB_GPIO_0_BASEADDR_0
+#define XPAR_GPIO_0_HIGHADDR XPAR_OPB_GPIO_0_HIGHADDR_0
+#define XPAR_GPIO_0_DEVICE_ID XPAR_OPB_GPIO_0_DEVICE_ID_0
+#define XPAR_GPIO_1_BASEADDR XPAR_OPB_GPIO_0_BASEADDR_1
+#define XPAR_GPIO_1_HIGHADDR XPAR_OPB_GPIO_0_HIGHADDR_1
+#define XPAR_GPIO_1_DEVICE_ID XPAR_OPB_GPIO_0_DEVICE_ID_1
+#define XPAR_GPIO_2_BASEADDR XPAR_OPB_GPIO_EXP_HDR_0_BASEADDR_0
+#define XPAR_GPIO_2_HIGHADDR XPAR_OPB_GPIO_EXP_HDR_0_HIGHADDR_0
+#define XPAR_GPIO_2_DEVICE_ID XPAR_OPB_GPIO_EXP_HDR_0_DEVICE_ID_0
+#define XPAR_GPIO_3_BASEADDR XPAR_OPB_GPIO_EXP_HDR_0_BASEADDR_1
+#define XPAR_GPIO_3_HIGHADDR XPAR_OPB_GPIO_EXP_HDR_0_HIGHADDR_1
+#define XPAR_GPIO_3_DEVICE_ID XPAR_OPB_GPIO_EXP_HDR_0_DEVICE_ID_1
+#define XPAR_GPIO_4_BASEADDR XPAR_OPB_GPIO_CHAR_LCD_0_BASEADDR
+#define XPAR_GPIO_4_HIGHADDR XPAR_OPB_GPIO_CHAR_LCD_0_HIGHADDR
+#define XPAR_GPIO_4_DEVICE_ID XPAR_OPB_GPIO_CHAR_LCD_0_DEVICE_ID
+
+/******************************************************************/
+
+#define XPAR_PS2_0_BASEADDR XPAR_OPB_PS2_DUAL_REF_0_BASEADDR_0
+#define XPAR_PS2_0_HIGHADDR XPAR_OPB_PS2_DUAL_REF_0_HIGHADDR_0
+#define XPAR_PS2_0_DEVICE_ID XPAR_OPB_PS2_DUAL_REF_0_DEVICE_ID_0
+#define XPAR_PS2_1_BASEADDR XPAR_OPB_PS2_DUAL_REF_0_BASEADDR_1
+#define XPAR_PS2_1_HIGHADDR XPAR_OPB_PS2_DUAL_REF_0_HIGHADDR_1
+#define XPAR_PS2_1_DEVICE_ID XPAR_OPB_PS2_DUAL_REF_0_DEVICE_ID_1
+
+/******************************************************************/
+
+#define XPAR_SYSACE_0_BASEADDR XPAR_OPB_SYSACE_0_BASEADDR
+#define XPAR_SYSACE_0_HIGHADDR XPAR_OPB_SYSACE_0_HIGHADDR
+#define XPAR_SYSACE_0_DEVICE_ID XPAR_OPB_SYSACE_0_DEVICE_ID
+
+/******************************************************************/
+
+#define XPAR_IIC_0_BASEADDR XPAR_OPB_IIC_0_BASEADDR
+#define XPAR_IIC_0_HIGHADDR XPAR_OPB_IIC_0_HIGHADDR
+#define XPAR_IIC_0_TEN_BIT_ADR XPAR_OPB_IIC_0_TEN_BIT_ADR
+#define XPAR_IIC_0_DEVICE_ID XPAR_OPB_IIC_0_DEVICE_ID
+
+/******************************************************************/
+
+#define XPAR_PLB_CLOCK_FREQ_HZ 100000000
+#define XPAR_CORE_CLOCK_FREQ_HZ XPAR_CPU_PPC405_CORE_CLOCK_FREQ_HZ
+#define XPAR_DDR_0_SIZE 0x4000000
+
+/******************************************************************/
+
+#define XPAR_PERSISTENT_0_IIC_0_BASEADDR 0x00000400
+#define XPAR_PERSISTENT_0_IIC_0_HIGHADDR 0x000007FF
+#define XPAR_PERSISTENT_0_IIC_0_EEPROMADDR 0xA0
+
+/******************************************************************/
+
+#define XPAR_PCI_0_CLOCK_FREQ_HZ    0
+
+/******************************************************************/
+
diff --git a/arch/ppc/platforms/4xx/yucca.c b/arch/ppc/platforms/4xx/yucca.c
index b065b8babcd3..f287dcdbffce 100644
--- a/arch/ppc/platforms/4xx/yucca.c
+++ b/arch/ppc/platforms/4xx/yucca.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/yucca.c
- *
  * Yucca board specific routines
  *
  * Roland Dreier <rolandd@cisco.com> (based on luan.c by Matt Porter)
diff --git a/arch/ppc/platforms/4xx/yucca.h b/arch/ppc/platforms/4xx/yucca.h
index 01a4afea1514..7ae23012237a 100644
--- a/arch/ppc/platforms/4xx/yucca.h
+++ b/arch/ppc/platforms/4xx/yucca.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/yucca.h
- *
  * Yucca board definitions
  *
  * Roland Dreier <rolandd@cisco.com> (based on luan.h by Matt Porter)
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c
index 1a659bbc1860..11626dd9090f 100644
--- a/arch/ppc/platforms/83xx/mpc834x_sys.c
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/83xx/mpc834x_sys.c
- *
  * MPC834x SYS board specific routines
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.h b/arch/ppc/platforms/83xx/mpc834x_sys.h
index 2e514d316fb8..6727bbdc36ec 100644
--- a/arch/ppc/platforms/83xx/mpc834x_sys.h
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/83xx/mpc834x_sys.h
- *
  * MPC834X SYS common board definitions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
@@ -25,7 +23,7 @@
 #define VIRT_IMMRBAR            ((uint)0xfe000000)
 
 #define BCSR_PHYS_ADDR          ((uint)0xf8000000)
-#define BCSR_SIZE               ((uint)(128 * 1024))
+#define BCSR_SIZE               ((uint)(32 * 1024))
 
 #define BCSR_MISC_REG2_OFF      0x07
 #define BCSR_MISC_REG2_PORESET  0x01
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c
index 408d64f18e1a..9b014df516b9 100644
--- a/arch/ppc/platforms/85xx/mpc8540_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8540_ads.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/mpc8540_ads.c
- *
  * MPC8540ADS board specific routines
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.h b/arch/ppc/platforms/85xx/mpc8540_ads.h
index e48ca3a97397..0b5e7ff856f5 100644
--- a/arch/ppc/platforms/85xx/mpc8540_ads.h
+++ b/arch/ppc/platforms/85xx/mpc8540_ads.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/mpc8540_ads.h
- *
  * MPC8540ADS board definitions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/85xx/mpc8555_cds.h b/arch/ppc/platforms/85xx/mpc8555_cds.h
index 1a8e6c67355d..9754dbd5d18c 100644
--- a/arch/ppc/platforms/85xx/mpc8555_cds.h
+++ b/arch/ppc/platforms/85xx/mpc8555_cds.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/mpc8555_cds.h
- *
  * MPC8555CDS board definitions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c
index 442c7ff195d3..0cb2e86470e2 100644
--- a/arch/ppc/platforms/85xx/mpc8560_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8560_ads.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/mpc8560_ads.c
- *
  * MPC8560ADS board specific routines
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.h b/arch/ppc/platforms/85xx/mpc8560_ads.h
index 143ae7eefa7c..c2247c21fc53 100644
--- a/arch/ppc/platforms/85xx/mpc8560_ads.h
+++ b/arch/ppc/platforms/85xx/mpc8560_ads.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/mpc8560_ads.h
- *
  * MPC8540ADS board definitions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
index 17ce48fe3503..8fd9d763f58d 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/mpc85xx_ads_common.c
- *
  * MPC85xx ADS board common routines
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h b/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
index 198a6a02cde8..de8d41aafe11 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
+++ b/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/mpc85xx_ads_common.h
- *
  * MPC85XX ADS common board definitions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index 1801ab392e22..c9e0aeeca3d8 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platform/85xx/mpc85xx_cds_common.c
- *
  * MPC85xx CDS board specific routines
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
index 5b588cfd0e41..62df54f61ae3 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/mpc85xx_cds_common.h
- *
  * MPC85xx CDS board definitions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c
index 8a72221f816c..b73778ecf827 100644
--- a/arch/ppc/platforms/85xx/sbc8560.c
+++ b/arch/ppc/platforms/85xx/sbc8560.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/sbc8560.c
- * 
  * Wind River SBC8560 board specific routines
  * 
  * Maintainer: Kumar Gala
diff --git a/arch/ppc/platforms/85xx/sbc8560.h b/arch/ppc/platforms/85xx/sbc8560.h
index 5e1b00c77da5..44ffaa2d2c87 100644
--- a/arch/ppc/platforms/85xx/sbc8560.h
+++ b/arch/ppc/platforms/85xx/sbc8560.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/sbc8560.h
- *
  * Wind River SBC8560 board definitions
  *
  * Copyright 2003 Motorola Inc.
diff --git a/arch/ppc/platforms/85xx/sbc85xx.c b/arch/ppc/platforms/85xx/sbc85xx.c
index c02f110219f5..d3ff280510ff 100644
--- a/arch/ppc/platforms/85xx/sbc85xx.c
+++ b/arch/ppc/platforms/85xx/sbc85xx.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platform/85xx/sbc85xx.c
- * 
  * WindRiver PowerQUICC III SBC85xx board common routines
  *
  * Copyright 2002, 2003 Motorola Inc.
diff --git a/arch/ppc/platforms/85xx/sbc85xx.h b/arch/ppc/platforms/85xx/sbc85xx.h
index 7af93c691a6b..5dd8b6a98c9b 100644
--- a/arch/ppc/platforms/85xx/sbc85xx.h
+++ b/arch/ppc/platforms/85xx/sbc85xx.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/sbc85xx.h
- *
  * WindRiver PowerQUICC III SBC85xx common board definitions
  *
  * Copyright 2003 Motorola Inc.
diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c
index 061bb7cf2d9a..8d7baa9a397a 100644
--- a/arch/ppc/platforms/85xx/stx_gp3.c
+++ b/arch/ppc/platforms/85xx/stx_gp3.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/stx_gp3.c
- *
  * STx GP3 board specific routines
  *
  * Dan Malek <dan@embeddededge.com>
diff --git a/arch/ppc/platforms/85xx/stx_gp3.h b/arch/ppc/platforms/85xx/stx_gp3.h
index 2f25b5195152..3f71f8f59370 100644
--- a/arch/ppc/platforms/85xx/stx_gp3.h
+++ b/arch/ppc/platforms/85xx/stx_gp3.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/stx8560_gp3.h
- *
  * STx GP3 board definitions
  *
  * Dan Malek (dan@embeddededge.com)
diff --git a/arch/ppc/platforms/85xx/tqm85xx.c b/arch/ppc/platforms/85xx/tqm85xx.c
index a5e38ba62732..00af132262b3 100644
--- a/arch/ppc/platforms/85xx/tqm85xx.c
+++ b/arch/ppc/platforms/85xx/tqm85xx.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/tqm85xx.c
- *
  * TQM85xx (40/41/55/60) board specific routines
  *
  * Copyright (c) 2005 DENX Software Engineering
diff --git a/arch/ppc/platforms/85xx/tqm85xx.h b/arch/ppc/platforms/85xx/tqm85xx.h
index 3775eb363fde..612d80504f9b 100644
--- a/arch/ppc/platforms/85xx/tqm85xx.h
+++ b/arch/ppc/platforms/85xx/tqm85xx.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/tqm85xx.h
- *
  * TQM85xx (40/41/55/60) board definitions
  *
  * Copyright (c) 2005 DENX Software Engineering
diff --git a/arch/ppc/platforms/Makefile b/arch/ppc/platforms/Makefile
index 51430e294b32..90c622294423 100644
--- a/arch/ppc/platforms/Makefile
+++ b/arch/ppc/platforms/Makefile
@@ -2,18 +2,10 @@
 # Makefile for the linux kernel.
 #
 
-# Extra CFLAGS so we don't have to do relative includes
-CFLAGS_chrp_setup.o     += -Iarch/$(ARCH)/mm
-
 obj-$(CONFIG_APUS)              += apus_setup.o
 ifeq ($(CONFIG_APUS),y)
 obj-$(CONFIG_PCI)               += apus_pci.o
 endif
-obj-$(CONFIG_PPC_CHRP)          += chrp_setup.o chrp_time.o chrp_pci.o \
-                                        chrp_pegasos_eth.o
-ifeq ($(CONFIG_PPC_CHRP),y)
-obj-$(CONFIG_NVRAM)             += chrp_nvram.o
-endif
 obj-$(CONFIG_PPC_PREP)          += prep_pci.o prep_setup.o
 obj-$(CONFIG_PREP_RESIDUAL)     += residual.o
 obj-$(CONFIG_PQ2ADS)            += pq2ads.o
@@ -37,7 +29,6 @@ obj-$(CONFIG_SBC82xx)		+= sbc82xx.o
 obj-$(CONFIG_SPRUCE)            += spruce.o
 obj-$(CONFIG_LITE5200)          += lite5200.o
 obj-$(CONFIG_EV64360)           += ev64360.o
-
-ifeq ($(CONFIG_SMP),y)
-obj-$(CONFIG_PPC_CHRP)          += chrp_smp.o
-endif
+obj-$(CONFIG_MPC86XADS)         += mpc866ads_setup.o
+obj-$(CONFIG_MPC885ADS)         += mpc885ads_setup.o
+obj-$(CONFIG_ADS8272)           += mpc8272ads_setup.o
diff --git a/arch/ppc/platforms/apus_setup.c b/arch/ppc/platforms/apus_setup.c
index c42c50073da5..fe0cdc04d436 100644
--- a/arch/ppc/platforms/apus_setup.c
+++ b/arch/ppc/platforms/apus_setup.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/platforms/apus_setup.c
- *
  *  Copyright (C) 1998, 1999  Jesper Skov
  *
  *  Basically what is needed to replace functionality found in
diff --git a/arch/ppc/platforms/chestnut.c b/arch/ppc/platforms/chestnut.c
index aefcc0e7be57..f324f757cae1 100644
--- a/arch/ppc/platforms/chestnut.c
+++ b/arch/ppc/platforms/chestnut.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/chestnut.c
- *
  * Board setup routines for IBM Chestnut
  *
  * Author: <source@mvista.com>
diff --git a/arch/ppc/platforms/chestnut.h b/arch/ppc/platforms/chestnut.h
index 0400b2be40ab..e00fd9f8bbd0 100644
--- a/arch/ppc/platforms/chestnut.h
+++ b/arch/ppc/platforms/chestnut.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/chestnut.h
- *
  * Definitions for IBM 750FXGX Eval (Chestnut)
  *
  * Author: <source@mvista.com>
diff --git a/arch/ppc/platforms/chrp_nvram.c b/arch/ppc/platforms/chrp_nvram.c
deleted file mode 100644
index 465ba9b090ef..000000000000
--- a/arch/ppc/platforms/chrp_nvram.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  c 2001 PPC 64 Team, IBM Corp
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * /dev/nvram driver for PPC
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <asm/uaccess.h>
-#include <asm/prom.h>
-#include <asm/machdep.h>
-
-static unsigned int nvram_size;
-static unsigned char nvram_buf[4];
-static DEFINE_SPINLOCK(nvram_lock);
-
-static unsigned char chrp_nvram_read(int addr)
-{
-        unsigned long done, flags;
-        unsigned char ret;
-
-        if (addr >= nvram_size) {
-                printk(KERN_DEBUG "%s: read addr %d > nvram_size %u\n",
-                       current->comm, addr, nvram_size);
-                return 0xff;
-        }
-        spin_lock_irqsave(&nvram_lock, flags);
-        if ((call_rtas("nvram-fetch", 3, 2, &done, addr, __pa(nvram_buf), 1) != 0) || 1 != done)
-                ret = 0xff;
-        else
-                ret = nvram_buf[0];
-        spin_unlock_irqrestore(&nvram_lock, flags);
-
-        return ret;
-}
-
-static void chrp_nvram_write(int addr, unsigned char val)
-{
-        unsigned long done, flags;
-
-        if (addr >= nvram_size) {
-                printk(KERN_DEBUG "%s: write addr %d > nvram_size %u\n",
-                       current->comm, addr, nvram_size);
-                return;
-        }
-        spin_lock_irqsave(&nvram_lock, flags);
-        nvram_buf[0] = val;
-        if ((call_rtas("nvram-store", 3, 2, &done, addr, __pa(nvram_buf), 1) != 0) || 1 != done)
-                printk(KERN_DEBUG "rtas IO error storing 0x%02x at %d", val, addr);
-        spin_unlock_irqrestore(&nvram_lock, flags);
-}
-
-void __init chrp_nvram_init(void)
-{
-        struct device_node *nvram;
-        unsigned int *nbytes_p, proplen;
-
-        nvram = of_find_node_by_type(NULL, "nvram");
-        if (nvram == NULL)
-                return;
-
-        nbytes_p = (unsigned int *)get_property(nvram, "#bytes", &proplen);
-        if (nbytes_p == NULL || proplen != sizeof(unsigned int))
-                return;
-
-        nvram_size = *nbytes_p;
-
-        printk(KERN_INFO "CHRP nvram contains %u bytes\n", nvram_size);
-        of_node_put(nvram);
-
-        ppc_md.nvram_read_val = chrp_nvram_read;
-        ppc_md.nvram_write_val = chrp_nvram_write;
-
-        return;
-}
diff --git a/arch/ppc/platforms/chrp_pci.c b/arch/ppc/platforms/chrp_pci.c
deleted file mode 100644
index c7fe6182bb77..000000000000
--- a/arch/ppc/platforms/chrp_pci.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * CHRP pci routines.
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/ide.h>
-
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/irq.h>
-#include <asm/hydra.h>
-#include <asm/prom.h>
-#include <asm/gg2.h>
-#include <asm/machdep.h>
-#include <asm/sections.h>
-#include <asm/pci-bridge.h>
-#include <asm/open_pic.h>
-
-/* LongTrail */
-void __iomem *gg2_pci_config_base;
-
-/*
- * The VLSI Golden Gate II has only 512K of PCI configuration space, so we
- * limit the bus number to 3 bits
- */
-
-int gg2_read_config(struct pci_bus *bus, unsigned int devfn, int off,
-                           int len, u32 *val)
-{
-        volatile void __iomem *cfg_data;
-        struct pci_controller *hose = bus->sysdata;
-
-        if (bus->number > 7)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        /*
-         * Note: the caller has already checked that off is
-         * suitably aligned and that len is 1, 2 or 4.
-         */
-        cfg_data = hose->cfg_data + ((bus->number<<16) | (devfn<<8) | off);
-        switch (len) {
-        case 1:
-                *val =  in_8(cfg_data);
-                break;
-        case 2:
-                *val = in_le16(cfg_data);
-                break;
-        default:
-                *val = in_le32(cfg_data);
-                break;
-        }
-        return PCIBIOS_SUCCESSFUL;
-}
-
-int gg2_write_config(struct pci_bus *bus, unsigned int devfn, int off,
-                            int len, u32 val)
-{
-        volatile void __iomem *cfg_data;
-        struct pci_controller *hose = bus->sysdata;
-
-        if (bus->number > 7)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        /*
-         * Note: the caller has already checked that off is
-         * suitably aligned and that len is 1, 2 or 4.
-         */
-        cfg_data = hose->cfg_data + ((bus->number<<16) | (devfn<<8) | off);
-        switch (len) {
-        case 1:
-                out_8(cfg_data, val);
-                break;
-        case 2:
-                out_le16(cfg_data, val);
-                break;
-        default:
-                out_le32(cfg_data, val);
-                break;
-        }
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops gg2_pci_ops =
-{
-        gg2_read_config,
-        gg2_write_config
-};
-
-/*
- * Access functions for PCI config space using RTAS calls.
- */
-int
-rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
-                 int len, u32 *val)
-{
-        struct pci_controller *hose = bus->sysdata;
-        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
-                | (((bus->number - hose->first_busno) & 0xff) << 16)
-                | (hose->index << 24);
-        unsigned long ret = ~0UL;
-        int rval;
-
-        rval = call_rtas("read-pci-config", 2, 2, &ret, addr, len);
-        *val = ret;
-        return rval? PCIBIOS_DEVICE_NOT_FOUND: PCIBIOS_SUCCESSFUL;
-}
-
-int
-rtas_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
-                  int len, u32 val)
-{
-        struct pci_controller *hose = bus->sysdata;
-        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
-                | (((bus->number - hose->first_busno) & 0xff) << 16)
-                | (hose->index << 24);
-        int rval;
-
-        rval = call_rtas("write-pci-config", 3, 1, NULL, addr, len, val);
-        return rval? PCIBIOS_DEVICE_NOT_FOUND: PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops rtas_pci_ops =
-{
-        rtas_read_config,
-        rtas_write_config
-};
-
-volatile struct Hydra __iomem *Hydra = NULL;
-
-int __init
-hydra_init(void)
-{
-        struct device_node *np;
-
-        np = find_devices("mac-io");
-        if (np == NULL || np->n_addrs == 0)
-                return 0;
-        Hydra = ioremap(np->addrs[0].address, np->addrs[0].size);
-        printk("Hydra Mac I/O at %x\n", np->addrs[0].address);
-        printk("Hydra Feature_Control was %x",
-               in_le32(&Hydra->Feature_Control));
-        out_le32(&Hydra->Feature_Control, (HYDRA_FC_SCC_CELL_EN |
-                                           HYDRA_FC_SCSI_CELL_EN |
-                                           HYDRA_FC_SCCA_ENABLE |
-                                           HYDRA_FC_SCCB_ENABLE |
-                                           HYDRA_FC_ARB_BYPASS |
-                                           HYDRA_FC_MPIC_ENABLE |
-                                           HYDRA_FC_SLOW_SCC_PCLK |
-                                           HYDRA_FC_MPIC_IS_MASTER));
-        printk(", now %x\n", in_le32(&Hydra->Feature_Control));
-        return 1;
-}
-
-void __init
-chrp_pcibios_fixup(void)
-{
-        struct pci_dev *dev = NULL;
-        struct device_node *np;
-
-        /* PCI interrupts are controlled by the OpenPIC */
-        for_each_pci_dev(dev) {
-                np = pci_device_to_OF_node(dev);
-                if ((np != 0) && (np->n_intrs > 0) && (np->intrs[0].line != 0))
-                        dev->irq = np->intrs[0].line;
-                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-        }
-}
-
-#define PRG_CL_RESET_VALID 0x00010000
-
-static void __init
-setup_python(struct pci_controller *hose, struct device_node *dev)
-{
-        u32 __iomem *reg;
-        u32 val;
-        unsigned long addr = dev->addrs[0].address;
-
-        setup_indirect_pci(hose, addr + 0xf8000, addr + 0xf8010);
-
-        /* Clear the magic go-slow bit */
-        reg = ioremap(dev->addrs[0].address + 0xf6000, 0x40);
-        val = in_be32(&reg[12]);
-        if (val & PRG_CL_RESET_VALID) {
-                out_be32(&reg[12], val & ~PRG_CL_RESET_VALID);
-                in_be32(&reg[12]);
-        }
-        iounmap(reg);
-}
-
-/* Marvell Discovery II based Pegasos 2 */
-static void __init setup_peg2(struct pci_controller *hose, struct device_node *dev)
-{
-        struct device_node *root = find_path_device("/");
-        struct device_node *rtas;
-
-        rtas = of_find_node_by_name (root, "rtas");
-        if (rtas) {
-                hose->ops = &rtas_pci_ops;
-        } else {
-                printk ("RTAS supporting Pegasos OF not found, please upgrade"
-                        " your firmware\n");
-        }
-        pci_assign_all_buses = 1;
-}
-
-void __init
-chrp_find_bridges(void)
-{
-        struct device_node *dev;
-        int *bus_range;
-        int len, index = -1;
-        struct pci_controller *hose;
-        unsigned int *dma;
-        char *model, *machine;
-        int is_longtrail = 0, is_mot = 0, is_pegasos = 0;
-        struct device_node *root = find_path_device("/");
-
-        /*
-         * The PCI host bridge nodes on some machines don't have
-         * properties to adequately identify them, so we have to
-         * look at what sort of machine this is as well.
-         */
-        machine = get_property(root, "model", NULL);
-        if (machine != NULL) {
-                is_longtrail = strncmp(machine, "IBM,LongTrail", 13) == 0;
-                is_mot = strncmp(machine, "MOT", 3) == 0;
-                if (strncmp(machine, "Pegasos2", 8) == 0)
-                        is_pegasos = 2;
-                else if (strncmp(machine, "Pegasos", 7) == 0)
-                        is_pegasos = 1;
-        }
-        for (dev = root->child; dev != NULL; dev = dev->sibling) {
-                if (dev->type == NULL || strcmp(dev->type, "pci") != 0)
-                        continue;
-                ++index;
-                /* The GG2 bridge on the LongTrail doesn't have an address */
-                if (dev->n_addrs < 1 && !is_longtrail) {
-                        printk(KERN_WARNING "Can't use %s: no address\n",
-                               dev->full_name);
-                        continue;
-                }
-                bus_range = (int *) get_property(dev, "bus-range", &len);
-                if (bus_range == NULL || len < 2 * sizeof(int)) {
-                        printk(KERN_WARNING "Can't get bus-range for %s\n",
-                                dev->full_name);
-                        continue;
-                }
-                if (bus_range[1] == bus_range[0])
-                        printk(KERN_INFO "PCI bus %d", bus_range[0]);
-                else
-                        printk(KERN_INFO "PCI buses %d..%d",
-                               bus_range[0], bus_range[1]);
-                printk(" controlled by %s", dev->type);
-                if (dev->n_addrs > 0)
-                        printk(" at %x", dev->addrs[0].address);
-                printk("\n");
-
-                hose = pcibios_alloc_controller();
-                if (!hose) {
-                        printk("Can't allocate PCI controller structure for %s\n",
-                                dev->full_name);
-                        continue;
-                }
-                hose->arch_data = dev;
-                hose->first_busno = bus_range[0];
-                hose->last_busno = bus_range[1];
-
-                model = get_property(dev, "model", NULL);
-                if (model == NULL)
-                        model = "<none>";
-                if (device_is_compatible(dev, "IBM,python")) {
-                        setup_python(hose, dev);
-                } else if (is_mot
-                           || strncmp(model, "Motorola, Grackle", 17) == 0) {
-                        setup_indirect_pci(hose, 0xfec00000, 0xfee00000);
-                } else if (is_longtrail) {
-                        void __iomem *p = ioremap(GG2_PCI_CONFIG_BASE, 0x80000);
-                        hose->ops = &gg2_pci_ops;
-                        hose->cfg_data = p;
-                        gg2_pci_config_base = p;
-                } else if (is_pegasos == 1) {
-                        setup_indirect_pci(hose, 0xfec00cf8, 0xfee00cfc);
-                } else if (is_pegasos == 2) {
-                        setup_peg2(hose, dev);
-                } else {
-                        printk("No methods for %s (model %s), using RTAS\n",
-                               dev->full_name, model);
-                        hose->ops = &rtas_pci_ops;
-                }
-
-                pci_process_bridge_OF_ranges(hose, dev, index == 0);
-
-                /* check the first bridge for a property that we can
-                   use to set pci_dram_offset */
-                dma = (unsigned int *)
-                        get_property(dev, "ibm,dma-ranges", &len);
-                if (index == 0 && dma != NULL && len >= 6 * sizeof(*dma)) {
-                        pci_dram_offset = dma[2] - dma[3];
-                        printk("pci_dram_offset = %lx\n", pci_dram_offset);
-                }
-        }
-
-        /* Do not fixup interrupts from OF tree on pegasos */
-        if (is_pegasos == 0)
-                ppc_md.pcibios_fixup = chrp_pcibios_fixup;
-}
diff --git a/arch/ppc/platforms/chrp_pegasos_eth.c b/arch/ppc/platforms/chrp_pegasos_eth.c
deleted file mode 100644
index 108a6e265185..000000000000
--- a/arch/ppc/platforms/chrp_pegasos_eth.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- *  arch/ppc/platforms/chrp_pegasos_eth.c
- *
- *  Copyright (C) 2005 Sven Luther <sl@bplan-gmbh.de>
- *  Thanks to :
- *      Dale Farnsworth <dale@farnsworth.org>
- *      Mark A. Greer <mgreer@mvista.com>
- *      Nicolas DET <nd@bplan-gmbh.de>
- *      Benjamin Herrenschmidt <benh@kernel.crashing.org>
- *  And anyone else who helped me on this.
- */
-
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/platform_device.h>
-#include <linux/mv643xx.h>
-#include <linux/pci.h>
-
-#define PEGASOS2_MARVELL_REGBASE                (0xf1000000)
-#define PEGASOS2_MARVELL_REGSIZE                (0x00004000)
-#define PEGASOS2_SRAM_BASE                      (0xf2000000)
-#define PEGASOS2_SRAM_SIZE                      (256*1024)
-
-#define PEGASOS2_SRAM_BASE_ETH0                 (PEGASOS2_SRAM_BASE)
-#define PEGASOS2_SRAM_BASE_ETH1                 (PEGASOS2_SRAM_BASE_ETH0 + (PEGASOS2_SRAM_SIZE / 2) )
-
-
-#define PEGASOS2_SRAM_RXRING_SIZE               (PEGASOS2_SRAM_SIZE/4)
-#define PEGASOS2_SRAM_TXRING_SIZE               (PEGASOS2_SRAM_SIZE/4)
-
-#undef BE_VERBOSE
-
-static struct resource mv643xx_eth_shared_resources[] = {
-        [0] = {
-                .name   = "ethernet shared base",
-                .start  = 0xf1000000 + MV643XX_ETH_SHARED_REGS,
-                .end    = 0xf1000000 + MV643XX_ETH_SHARED_REGS +
-                                        MV643XX_ETH_SHARED_REGS_SIZE - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device mv643xx_eth_shared_device = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(mv643xx_eth_shared_resources),
-        .resource       = mv643xx_eth_shared_resources,
-};
-
-static struct resource mv643xx_eth0_resources[] = {
-        [0] = {
-                .name   = "eth0 irq",
-                .start  = 9,
-                .end    = 9,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-
-static struct mv643xx_eth_platform_data eth0_pd = {
-        .tx_sram_addr = PEGASOS2_SRAM_BASE_ETH0,
-        .tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE,
-        .tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16,
-
-        .rx_sram_addr = PEGASOS2_SRAM_BASE_ETH0 + PEGASOS2_SRAM_TXRING_SIZE,
-        .rx_sram_size = PEGASOS2_SRAM_RXRING_SIZE,
-        .rx_queue_size = PEGASOS2_SRAM_RXRING_SIZE/16,
-};
-
-static struct platform_device eth0_device = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(mv643xx_eth0_resources),
-        .resource       = mv643xx_eth0_resources,
-        .dev = {
-                .platform_data = &eth0_pd,
-        },
-};
-
-static struct resource mv643xx_eth1_resources[] = {
-        [0] = {
-                .name   = "eth1 irq",
-                .start  = 9,
-                .end    = 9,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv643xx_eth_platform_data eth1_pd = {
-        .tx_sram_addr = PEGASOS2_SRAM_BASE_ETH1,
-        .tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE,
-        .tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16,
-
-        .rx_sram_addr = PEGASOS2_SRAM_BASE_ETH1 + PEGASOS2_SRAM_TXRING_SIZE,
-        .rx_sram_size = PEGASOS2_SRAM_RXRING_SIZE,
-        .rx_queue_size = PEGASOS2_SRAM_RXRING_SIZE/16,
-};
-
-static struct platform_device eth1_device = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(mv643xx_eth1_resources),
-        .resource       = mv643xx_eth1_resources,
-        .dev = {
-                .platform_data = &eth1_pd,
-        },
-};
-
-static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
-        &mv643xx_eth_shared_device,
-        &eth0_device,
-        &eth1_device,
-};
-
-/***********/
-/***********/
-#define MV_READ(offset,val)     { val = readl(mv643xx_reg_base + offset); }
-#define MV_WRITE(offset,data) writel(data, mv643xx_reg_base + offset)
-
-static void __iomem *mv643xx_reg_base;
-
-static int Enable_SRAM(void)
-{
-        u32 ALong;
-
-        if (mv643xx_reg_base == NULL)
-                mv643xx_reg_base = ioremap(PEGASOS2_MARVELL_REGBASE,
-                                        PEGASOS2_MARVELL_REGSIZE);
-
-        if (mv643xx_reg_base == NULL)
-                return -ENOMEM;
-
-#ifdef BE_VERBOSE
-        printk("Pegasos II/Marvell MV64361: register remapped from %p to %p\n",
-                (void *)PEGASOS2_MARVELL_REGBASE, (void *)mv643xx_reg_base);
-#endif
-
-        MV_WRITE(MV64340_SRAM_CONFIG, 0);
-
-        MV_WRITE(MV64340_INTEGRATED_SRAM_BASE_ADDR, PEGASOS2_SRAM_BASE >> 16);
-
-        MV_READ(MV64340_BASE_ADDR_ENABLE, ALong);
-        ALong &= ~(1 << 19);
-        MV_WRITE(MV64340_BASE_ADDR_ENABLE, ALong);
-
-        ALong = 0x02;
-        ALong |= PEGASOS2_SRAM_BASE & 0xffff0000;
-        MV_WRITE(MV643XX_ETH_BAR_4, ALong);
-
-        MV_WRITE(MV643XX_ETH_SIZE_REG_4, (PEGASOS2_SRAM_SIZE-1) & 0xffff0000);
-
-        MV_READ(MV643XX_ETH_BASE_ADDR_ENABLE_REG, ALong);
-        ALong &= ~(1 << 4);
-        MV_WRITE(MV643XX_ETH_BASE_ADDR_ENABLE_REG, ALong);
-
-#ifdef BE_VERBOSE
-        printk("Pegasos II/Marvell MV64361: register unmapped\n");
-        printk("Pegasos II/Marvell MV64361: SRAM at %p, size=%x\n", (void*) PEGASOS2_SRAM_BASE, PEGASOS2_SRAM_SIZE);
-#endif
-
-        iounmap(mv643xx_reg_base);
-        mv643xx_reg_base = NULL;
-
-        return 1;
-}
-
-
-/***********/
-/***********/
-int mv643xx_eth_add_pds(void)
-{
-        int ret = 0;
-        static struct pci_device_id pci_marvell_mv64360[] = {
-                { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) },
-                { }
-        };
-
-#ifdef BE_VERBOSE
-        printk("Pegasos II/Marvell MV64361: init\n");
-#endif
-
-        if (pci_dev_present(pci_marvell_mv64360)) {
-                ret = platform_add_devices(mv643xx_eth_pd_devs,
-                                ARRAY_SIZE(mv643xx_eth_pd_devs));
-
-                if ( Enable_SRAM() < 0)
-                {
-                        eth0_pd.tx_sram_addr = 0;
-                        eth0_pd.tx_sram_size = 0;
-                        eth0_pd.rx_sram_addr = 0;
-                        eth0_pd.rx_sram_size = 0;
-
-                        eth1_pd.tx_sram_addr = 0;
-                        eth1_pd.tx_sram_size = 0;
-                        eth1_pd.rx_sram_addr = 0;
-                        eth1_pd.rx_sram_size = 0;
-
-#ifdef BE_VERBOSE
-                        printk("Pegasos II/Marvell MV64361: Can't enable the "
-                                "SRAM\n");
-#endif
-                }
-        }
-
-#ifdef BE_VERBOSE
-        printk("Pegasos II/Marvell MV64361: init is over\n");
-#endif
-
-        return ret;
-}
-
-device_initcall(mv643xx_eth_add_pds);
diff --git a/arch/ppc/platforms/chrp_setup.c b/arch/ppc/platforms/chrp_setup.c
deleted file mode 100644
index 48996b787378..000000000000
--- a/arch/ppc/platforms/chrp_setup.c
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
- *  arch/ppc/platforms/setup.c
- *
- *  Copyright (C) 1995  Linus Torvalds
- *  Adapted from 'alpha' version by Gary Thomas
- *  Modified by Cort Dougan (cort@cs.nmt.edu)
- */
-
-/*
- * bootup setup stuff..
- */
-
-#include <linux/config.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/stddef.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/tty.h>
-#include <linux/major.h>
-#include <linux/interrupt.h>
-#include <linux/reboot.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/version.h>
-#include <linux/adb.h>
-#include <linux/module.h>
-#include <linux/delay.h>
-#include <linux/ide.h>
-#include <linux/console.h>
-#include <linux/seq_file.h>
-#include <linux/root_dev.h>
-#include <linux/initrd.h>
-#include <linux/module.h>
-
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/prom.h>
-#include <asm/gg2.h>
-#include <asm/pci-bridge.h>
-#include <asm/dma.h>
-#include <asm/machdep.h>
-#include <asm/irq.h>
-#include <asm/hydra.h>
-#include <asm/sections.h>
-#include <asm/time.h>
-#include <asm/btext.h>
-#include <asm/i8259.h>
-#include <asm/open_pic.h>
-#include <asm/xmon.h>
-#include "mem_pieces.h"
-
-unsigned long chrp_get_rtc_time(void);
-int chrp_set_rtc_time(unsigned long nowtime);
-void chrp_calibrate_decr(void);
-long chrp_time_init(void);
-
-void chrp_find_bridges(void);
-void chrp_event_scan(void);
-void rtas_display_progress(char *, unsigned short);
-void rtas_indicator_progress(char *, unsigned short);
-void btext_progress(char *, unsigned short);
-
-extern int of_show_percpuinfo(struct seq_file *, int);
-
-int _chrp_type;
-EXPORT_SYMBOL(_chrp_type);
-
-/*
- * XXX this should be in xmon.h, but putting it there means xmon.h
- * has to include <linux/interrupt.h> (to get irqreturn_t), which
- * causes all sorts of problems.  -- paulus
- */
-extern irqreturn_t xmon_irq(int, void *, struct pt_regs *);
-
-extern dev_t boot_dev;
-
-extern PTE *Hash, *Hash_end;
-extern unsigned long Hash_size, Hash_mask;
-extern int probingmem;
-extern unsigned long loops_per_jiffy;
-static int max_width;
-
-#ifdef CONFIG_SMP
-extern struct smp_ops_t chrp_smp_ops;
-#endif
-
-static const char *gg2_memtypes[4] = {
-        "FPM", "SDRAM", "EDO", "BEDO"
-};
-static const char *gg2_cachesizes[4] = {
-        "256 KB", "512 KB", "1 MB", "Reserved"
-};
-static const char *gg2_cachetypes[4] = {
-        "Asynchronous", "Reserved", "Flow-Through Synchronous",
-        "Pipelined Synchronous"
-};
-static const char *gg2_cachemodes[4] = {
-        "Disabled", "Write-Through", "Copy-Back", "Transparent Mode"
-};
-
-int
-chrp_show_cpuinfo(struct seq_file *m)
-{
-        int i, sdramen;
-        unsigned int t;
-        struct device_node *root;
-        const char *model = "";
-
-        root = find_path_device("/");
-        if (root)
-                model = get_property(root, "model", NULL);
-        seq_printf(m, "machine\t\t: CHRP %s\n", model);
-
-        /* longtrail (goldengate) stuff */
-        if (!strncmp(model, "IBM,LongTrail", 13)) {
-                /* VLSI VAS96011/12 `Golden Gate 2' */
-                /* Memory banks */
-                sdramen = (in_le32(gg2_pci_config_base + GG2_PCI_DRAM_CTRL)
-                           >>31) & 1;
-                for (i = 0; i < (sdramen ? 4 : 6); i++) {
-                        t = in_le32(gg2_pci_config_base+
-                                                 GG2_PCI_DRAM_BANK0+
-                                                 i*4);
-                        if (!(t & 1))
-                                continue;
-                        switch ((t>>8) & 0x1f) {
-                        case 0x1f:
-                                model = "4 MB";
-                                break;
-                        case 0x1e:
-                                model = "8 MB";
-                                break;
-                        case 0x1c:
-                                model = "16 MB";
-                                break;
-                        case 0x18:
-                                model = "32 MB";
-                                break;
-                        case 0x10:
-                                model = "64 MB";
-                                break;
-                        case 0x00:
-                                model = "128 MB";
-                                break;
-                        default:
-                                model = "Reserved";
-                                break;
-                        }
-                        seq_printf(m, "memory bank %d\t: %s %s\n", i, model,
-                                   gg2_memtypes[sdramen ? 1 : ((t>>1) & 3)]);
-                }
-                /* L2 cache */
-                t = in_le32(gg2_pci_config_base+GG2_PCI_CC_CTRL);
-                seq_printf(m, "board l2\t: %s %s (%s)\n",
-                           gg2_cachesizes[(t>>7) & 3],
-                           gg2_cachetypes[(t>>2) & 3],
-                           gg2_cachemodes[t & 3]);
-        }
-        return 0;
-}
-
-/*
- *  Fixes for the National Semiconductor PC78308VUL SuperI/O
- *
- *  Some versions of Open Firmware incorrectly initialize the IRQ settings
- *  for keyboard and mouse
- */
-static inline void __init sio_write(u8 val, u8 index)
-{
-        outb(index, 0x15c);
-        outb(val, 0x15d);
-}
-
-static inline u8 __init sio_read(u8 index)
-{
-        outb(index, 0x15c);
-        return inb(0x15d);
-}
-
-static void __init sio_fixup_irq(const char *name, u8 device, u8 level,
-                                     u8 type)
-{
-        u8 level0, type0, active;
-
-        /* select logical device */
-        sio_write(device, 0x07);
-        active = sio_read(0x30);
-        level0 = sio_read(0x70);
-        type0 = sio_read(0x71);
-        if (level0 != level || type0 != type || !active) {
-                printk(KERN_WARNING "sio: %s irq level %d, type %d, %sactive: "
-                       "remapping to level %d, type %d, active\n",
-                       name, level0, type0, !active ? "in" : "", level, type);
-                sio_write(0x01, 0x30);
-                sio_write(level, 0x70);
-                sio_write(type, 0x71);
-        }
-}
-
-static void __init sio_init(void)
-{
-        struct device_node *root;
-
-        if ((root = find_path_device("/")) &&
-            !strncmp(get_property(root, "model", NULL), "IBM,LongTrail", 13)) {
-                /* logical device 0 (KBC/Keyboard) */
-                sio_fixup_irq("keyboard", 0, 1, 2);
-                /* select logical device 1 (KBC/Mouse) */
-                sio_fixup_irq("mouse", 1, 12, 2);
-        }
-}
-
-
-static void __init pegasos_set_l2cr(void)
-{
-        struct device_node *np;
-
-        /* On Pegasos, enable the l2 cache if needed, as the OF forgets it */
-        if (_chrp_type != _CHRP_Pegasos)
-                return;
-
-        /* Enable L2 cache if needed */
-        np = find_type_devices("cpu");
-        if (np != NULL) {
-                unsigned int *l2cr = (unsigned int *)
-                        get_property (np, "l2cr", NULL);
-                if (l2cr == NULL) {
-                        printk ("Pegasos l2cr : no cpu l2cr property found\n");
-                        return;
-                }
-                if (!((*l2cr) & 0x80000000)) {
-                        printk ("Pegasos l2cr : L2 cache was not active, "
-                                "activating\n");
-                        _set_L2CR(0);
-                        _set_L2CR((*l2cr) | 0x80000000);
-                }
-        }
-}
-
-void __init chrp_setup_arch(void)
-{
-        struct device_node *device;
-
-        /* init to some ~sane value until calibrate_delay() runs */
-        loops_per_jiffy = 50000000/HZ;
-
-#ifdef CONFIG_BLK_DEV_INITRD
-        /* this is fine for chrp */
-        initrd_below_start_ok = 1;
-
-        if (initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-#endif
-                ROOT_DEV = Root_SDA2; /* sda2 (sda1 is for the kernel) */
-
-        /* On pegasos, enable the L2 cache if not already done by OF */
-        pegasos_set_l2cr();
-
-        /* Lookup PCI host bridges */
-        chrp_find_bridges();
-
-#ifndef CONFIG_PPC64BRIDGE
-        /*
-         *  Temporary fixes for PCI devices.
-         *  -- Geert
-         */
-        hydra_init();           /* Mac I/O */
-
-#endif /* CONFIG_PPC64BRIDGE */
-
-        /*
-         *  Fix the Super I/O configuration
-         */
-        sio_init();
-
-        /* Get the event scan rate for the rtas so we know how
-         * often it expects a heartbeat. -- Cort
-         */
-        if ( rtas_data ) {
-                struct property *p;
-                device = find_devices("rtas");
-                for ( p = device->properties;
-                      p && strncmp(p->name, "rtas-event-scan-rate", 20);
-                      p = p->next )
-                        /* nothing */ ;
-                if ( p && *(unsigned long *)p->value ) {
-                        ppc_md.heartbeat = chrp_event_scan;
-                        ppc_md.heartbeat_reset = (HZ/(*(unsigned long *)p->value)*30)-1;
-                        ppc_md.heartbeat_count = 1;
-                        printk("RTAS Event Scan Rate: %lu (%lu jiffies)\n",
-                               *(unsigned long *)p->value, ppc_md.heartbeat_reset );
-                }
-        }
-
-        pci_create_OF_bus_map();
-}
-
-void
-chrp_event_scan(void)
-{
-        unsigned char log[1024];
-        unsigned long ret = 0;
-        /* XXX: we should loop until the hardware says no more error logs -- Cort */
-        call_rtas( "event-scan", 4, 1, &ret, 0xffffffff, 0,
-                   __pa(log), 1024 );
-        ppc_md.heartbeat_count = ppc_md.heartbeat_reset;
-}
-
-void
-chrp_restart(char *cmd)
-{
-        printk("RTAS system-reboot returned %d\n",
-               call_rtas("system-reboot", 0, 1, NULL));
-        for (;;);
-}
-
-void
-chrp_power_off(void)
-{
-        /* allow power on only with power button press */
-        printk("RTAS power-off returned %d\n",
-               call_rtas("power-off", 2, 1, NULL,0xffffffff,0xffffffff));
-        for (;;);
-}
-
-void
-chrp_halt(void)
-{
-        chrp_power_off();
-}
-
-/*
- * Finds the open-pic node and sets OpenPIC_Addr based on its reg property.
- * Then checks if it has an interrupt-ranges property.  If it does then
- * we have a distributed open-pic, so call openpic_set_sources to tell
- * the openpic code where to find the interrupt source registers.
- */
-static void __init chrp_find_openpic(void)
-{
-        struct device_node *np;
-        int len, i;
-        unsigned int *iranges;
-        void __iomem *isu;
-
-        np = find_type_devices("open-pic");
-        if (np == NULL || np->n_addrs == 0)
-                return;
-        printk(KERN_INFO "OpenPIC at %x (size %x)\n",
-               np->addrs[0].address, np->addrs[0].size);
-        OpenPIC_Addr = ioremap(np->addrs[0].address, 0x40000);
-        if (OpenPIC_Addr == NULL) {
-                printk(KERN_ERR "Failed to map OpenPIC!\n");
-                return;
-        }
-
-        iranges = (unsigned int *) get_property(np, "interrupt-ranges", &len);
-        if (iranges == NULL || len < 2 * sizeof(unsigned int))
-                return;         /* not distributed */
-
-        /*
-         * The first pair of cells in interrupt-ranges refers to the
-         * IDU; subsequent pairs refer to the ISUs.
-         */
-        len /= 2 * sizeof(unsigned int);
-        if (np->n_addrs < len) {
-                printk(KERN_ERR "Insufficient addresses for distributed"
-                       " OpenPIC (%d < %d)\n", np->n_addrs, len);
-                return;
-        }
-        if (iranges[1] != 0) {
-                printk(KERN_INFO "OpenPIC irqs %d..%d in IDU\n",
-                       iranges[0], iranges[0] + iranges[1] - 1);
-                openpic_set_sources(iranges[0], iranges[1], NULL);
-        }
-        for (i = 1; i < len; ++i) {
-                iranges += 2;
-                printk(KERN_INFO "OpenPIC irqs %d..%d in ISU at %x (%x)\n",
-                       iranges[0], iranges[0] + iranges[1] - 1,
-                       np->addrs[i].address, np->addrs[i].size);
-                isu = ioremap(np->addrs[i].address, np->addrs[i].size);
-                if (isu != NULL)
-                        openpic_set_sources(iranges[0], iranges[1], isu);
-                else
-                        printk(KERN_ERR "Failed to map OpenPIC ISU at %x!\n",
-                               np->addrs[i].address);
-        }
-}
-
-#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
-static struct irqaction xmon_irqaction = {
-        .handler = xmon_irq,
-        .mask = CPU_MASK_NONE,
-        .name = "XMON break",
-};
-#endif
-
-void __init chrp_init_IRQ(void)
-{
-        struct device_node *np;
-        unsigned long chrp_int_ack = 0;
-        unsigned char init_senses[NR_IRQS - NUM_8259_INTERRUPTS];
-#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
-        struct device_node *kbd;
-#endif
-
-        for (np = find_devices("pci"); np != NULL; np = np->next) {
-                unsigned int *addrp = (unsigned int *)
-                        get_property(np, "8259-interrupt-acknowledge", NULL);
-
-                if (addrp == NULL)
-                        continue;
-                chrp_int_ack = addrp[prom_n_addr_cells(np)-1];
-                break;
-        }
-        if (np == NULL)
-                printk(KERN_ERR "Cannot find PCI interrupt acknowledge address\n");
-
-        chrp_find_openpic();
-
-        if (OpenPIC_Addr) {
-                prom_get_irq_senses(init_senses, NUM_8259_INTERRUPTS, NR_IRQS);
-                OpenPIC_InitSenses = init_senses;
-                OpenPIC_NumInitSenses = NR_IRQS - NUM_8259_INTERRUPTS;
-
-                openpic_init(NUM_8259_INTERRUPTS);
-                /* We have a cascade on OpenPIC IRQ 0, Linux IRQ 16 */
-                openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
-                                       i8259_irq);
-
-        }
-        i8259_init(chrp_int_ack, 0);
-
-#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
-        /* see if there is a keyboard in the device tree
-           with a parent of type "adb" */
-        for (kbd = find_devices("keyboard"); kbd; kbd = kbd->next)
-                if (kbd->parent && kbd->parent->type
-                    && strcmp(kbd->parent->type, "adb") == 0)
-                        break;
-        if (kbd)
-                setup_irq(HYDRA_INT_ADB_NMI, &xmon_irqaction);
-#endif
-}
-
-void __init
-chrp_init2(void)
-{
-#ifdef CONFIG_NVRAM
-        chrp_nvram_init();
-#endif
-
-        request_region(0x20,0x20,"pic1");
-        request_region(0xa0,0x20,"pic2");
-        request_region(0x00,0x20,"dma1");
-        request_region(0x40,0x20,"timer");
-        request_region(0x80,0x10,"dma page reg");
-        request_region(0xc0,0x20,"dma2");
-
-        if (ppc_md.progress)
-                ppc_md.progress("  Have fun!    ", 0x7777);
-}
-
-static struct device_node *memory_node;
-
-static int __init get_mem_prop(char *name, struct mem_pieces *mp)
-{
-        struct reg_property *rp;
-        int i, s;
-        unsigned int *ip;
-        int nac = prom_n_addr_cells(memory_node);
-        int nsc = prom_n_size_cells(memory_node);
-
-        ip = (unsigned int *) get_property(memory_node, name, &s);
-        if (ip == NULL) {
-                printk(KERN_ERR "error: couldn't get %s property on /memory\n",
-                       name);
-                return 0;
-        }
-        s /= (nsc + nac) * 4;
-        rp = mp->regions;
-        for (i = 0; i < s; ++i, ip += nac+nsc) {
-                if (nac >= 2 && ip[nac-2] != 0)
-                        continue;
-                rp->address = ip[nac-1];
-                if (nsc >= 2 && ip[nac+nsc-2] != 0)
-                        rp->size = ~0U;
-                else
-                        rp->size = ip[nac+nsc-1];
-                ++rp;
-        }
-        mp->n_regions = rp - mp->regions;
-
-        /* Make sure the pieces are sorted. */
-        mem_pieces_sort(mp);
-        mem_pieces_coalesce(mp);
-        return 1;
-}
-
-static unsigned long __init chrp_find_end_of_memory(void)
-{
-        unsigned long a, total;
-        struct mem_pieces phys_mem;
-
-        /*
-         * Find out where physical memory is, and check that it
-         * starts at 0 and is contiguous.  It seems that RAM is
-         * always physically contiguous on Power Macintoshes.
-         *
-         * Supporting discontiguous physical memory isn't hard,
-         * it just makes the virtual <-> physical mapping functions
-         * more complicated (or else you end up wasting space
-         * in mem_map).
-         */
-        memory_node = find_devices("memory");
-        if (memory_node == NULL || !get_mem_prop("reg", &phys_mem)
-            || phys_mem.n_regions == 0)
-                panic("No RAM??");
-        a = phys_mem.regions[0].address;
-        if (a != 0)
-                panic("RAM doesn't start at physical address 0");
-        total = phys_mem.regions[0].size;
-
-        if (phys_mem.n_regions > 1) {
-                printk("RAM starting at 0x%x is not contiguous\n",
-                       phys_mem.regions[1].address);
-                printk("Using RAM from 0 to 0x%lx\n", total-1);
-        }
-
-        return total;
-}
-
-void __init
-chrp_init(unsigned long r3, unsigned long r4, unsigned long r5,
-          unsigned long r6, unsigned long r7)
-{
-        struct device_node *root = find_path_device ("/");
-        char *machine = NULL;
-
-#ifdef CONFIG_BLK_DEV_INITRD
-        /* take care of initrd if we have one */
-        if ( r6 )
-        {
-                initrd_start = r6 + KERNELBASE;
-                initrd_end = r6 + r7 + KERNELBASE;
-        }
-#endif /* CONFIG_BLK_DEV_INITRD */
-
-        ISA_DMA_THRESHOLD = ~0L;
-        DMA_MODE_READ = 0x44;
-        DMA_MODE_WRITE = 0x48;
-        isa_io_base = CHRP_ISA_IO_BASE;         /* default value */
-        ppc_do_canonicalize_irqs = 1;
-
-        if (root)
-                machine = get_property(root, "model", NULL);
-        if (machine && strncmp(machine, "Pegasos", 7) == 0) {
-                _chrp_type = _CHRP_Pegasos;
-        } else if (machine && strncmp(machine, "IBM", 3) == 0) {
-                _chrp_type = _CHRP_IBM;
-        } else if (machine && strncmp(machine, "MOT", 3) == 0) {
-                _chrp_type = _CHRP_Motorola;
-        } else {
-                /* Let's assume it is an IBM chrp if all else fails */
-                _chrp_type = _CHRP_IBM;
-        }
-
-        ppc_md.setup_arch     = chrp_setup_arch;
-        ppc_md.show_percpuinfo = of_show_percpuinfo;
-        ppc_md.show_cpuinfo   = chrp_show_cpuinfo;
-
-        ppc_md.init_IRQ       = chrp_init_IRQ;
-        if (_chrp_type == _CHRP_Pegasos)
-                ppc_md.get_irq        = i8259_irq;
-        else
-                ppc_md.get_irq        = openpic_get_irq;
-
-        ppc_md.init           = chrp_init2;
-
-        ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;
-
-        ppc_md.restart        = chrp_restart;
-        ppc_md.power_off      = chrp_power_off;
-        ppc_md.halt           = chrp_halt;
-
-        ppc_md.time_init      = chrp_time_init;
-        ppc_md.set_rtc_time   = chrp_set_rtc_time;
-        ppc_md.get_rtc_time   = chrp_get_rtc_time;
-        ppc_md.calibrate_decr = chrp_calibrate_decr;
-
-        ppc_md.find_end_of_memory = chrp_find_end_of_memory;
-
-        if (rtas_data) {
-                struct device_node *rtas;
-                unsigned int *p;
-
-                rtas = find_devices("rtas");
-                if (rtas != NULL) {
-                        if (get_property(rtas, "display-character", NULL)) {
-                                ppc_md.progress = rtas_display_progress;
-                                p = (unsigned int *) get_property
-                                       (rtas, "ibm,display-line-length", NULL);
-                                if (p)
-                                        max_width = *p;
-                        } else if (get_property(rtas, "set-indicator", NULL))
-                                ppc_md.progress = rtas_indicator_progress;
-                }
-        }
-#ifdef CONFIG_BOOTX_TEXT
-        if (ppc_md.progress == NULL && boot_text_mapped)
-                ppc_md.progress = btext_progress;
-#endif
-
-#ifdef CONFIG_SMP
-        smp_ops = &chrp_smp_ops;
-#endif /* CONFIG_SMP */
-
-        /*
-         * Print the banner, then scroll down so boot progress
-         * can be printed.  -- Cort
-         */
-        if (ppc_md.progress) ppc_md.progress("Linux/PPC "UTS_RELEASE"\n", 0x0);
-}
-
-void
-rtas_display_progress(char *s, unsigned short hex)
-{
-        int width;
-        char *os = s;
-
-        if ( call_rtas( "display-character", 1, 1, NULL, '\r' ) )
-                return;
-
-        width = max_width;
-        while ( *os )
-        {
-                if ( (*os == '\n') || (*os == '\r') )
-                        width = max_width;
-                else
-                        width--;
-                call_rtas( "display-character", 1, 1, NULL, *os++ );
-                /* if we overwrite the screen length */
-                if ( width == 0 )
-                        while ( (*os != 0) && (*os != '\n') && (*os != '\r') )
-                                os++;
-        }
-
-        /*while ( width-- > 0 )*/
-        call_rtas( "display-character", 1, 1, NULL, ' ' );
-}
-
-void
-rtas_indicator_progress(char *s, unsigned short hex)
-{
-        call_rtas("set-indicator", 3, 1, NULL, 6, 0, hex);
-}
-
-#ifdef CONFIG_BOOTX_TEXT
-void
-btext_progress(char *s, unsigned short hex)
-{
-        prom_print(s);
-        prom_print("\n");
-}
-#endif /* CONFIG_BOOTX_TEXT */
diff --git a/arch/ppc/platforms/chrp_smp.c b/arch/ppc/platforms/chrp_smp.c
deleted file mode 100644
index 97e539557ecb..000000000000
--- a/arch/ppc/platforms/chrp_smp.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Smp support for CHRP machines.
- *
- * Written by Cort Dougan (cort@cs.nmt.edu) borrowing a great
- * deal of code from the sparc and intel versions.
- *
- * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
- *
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/interrupt.h>
-#include <linux/kernel_stat.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-
-#include <asm/ptrace.h>
-#include <asm/atomic.h>
-#include <asm/irq.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/sections.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-#include <asm/smp.h>
-#include <asm/residual.h>
-#include <asm/time.h>
-#include <asm/open_pic.h>
-#include <asm/machdep.h>
-
-extern unsigned long smp_chrp_cpu_nr;
-
-static int __init
-smp_chrp_probe(void)
-{
-        if (smp_chrp_cpu_nr > 1)
-                openpic_request_IPIs();
-
-        return smp_chrp_cpu_nr;
-}
-
-static void __devinit
-smp_chrp_kick_cpu(int nr)
-{
-        *(unsigned long *)KERNELBASE = nr;
-        asm volatile("dcbf 0,%0"::"r"(KERNELBASE):"memory");
-}
-
-static void __devinit
-smp_chrp_setup_cpu(int cpu_nr)
-{
-        if (OpenPIC_Addr)
-                do_openpic_setup_cpu();
-}
-
-static DEFINE_SPINLOCK(timebase_lock);
-static unsigned int timebase_upper = 0, timebase_lower = 0;
-
-void __devinit
-smp_chrp_give_timebase(void)
-{
-        spin_lock(&timebase_lock);
-        call_rtas("freeze-time-base", 0, 1, NULL);
-        timebase_upper = get_tbu();
-        timebase_lower = get_tbl();
-        spin_unlock(&timebase_lock);
-
-        while (timebase_upper || timebase_lower)
-                barrier();
-        call_rtas("thaw-time-base", 0, 1, NULL);
-}
-
-void __devinit
-smp_chrp_take_timebase(void)
-{
-        while (!(timebase_upper || timebase_lower))
-                barrier();
-        spin_lock(&timebase_lock);
-        set_tb(timebase_upper, timebase_lower);
-        timebase_upper = 0;
-        timebase_lower = 0;
-        spin_unlock(&timebase_lock);
-        printk("CPU %i taken timebase\n", smp_processor_id());
-}
-
-/* CHRP with openpic */
-struct smp_ops_t chrp_smp_ops = {
-        .message_pass = smp_openpic_message_pass,
-        .probe = smp_chrp_probe,
-        .kick_cpu = smp_chrp_kick_cpu,
-        .setup_cpu = smp_chrp_setup_cpu,
-        .give_timebase = smp_chrp_give_timebase,
-        .take_timebase = smp_chrp_take_timebase,
-};
diff --git a/arch/ppc/platforms/chrp_time.c b/arch/ppc/platforms/chrp_time.c
deleted file mode 100644
index 57753a55b580..000000000000
--- a/arch/ppc/platforms/chrp_time.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- *  arch/ppc/platforms/chrp_time.c
- *
- *  Copyright (C) 1991, 1992, 1995  Linus Torvalds
- *
- * Adapted for PowerPC (PReP) by Gary Thomas
- * Modified by Cort Dougan (cort@cs.nmt.edu).
- * Copied and modified from arch/i386/kernel/time.c
- *
- */
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/time.h>
-#include <linux/timex.h>
-#include <linux/kernel_stat.h>
-#include <linux/mc146818rtc.h>
-#include <linux/init.h>
-#include <linux/bcd.h>
-
-#include <asm/io.h>
-#include <asm/nvram.h>
-#include <asm/prom.h>
-#include <asm/sections.h>
-#include <asm/time.h>
-
-extern spinlock_t rtc_lock;
-
-static int nvram_as1 = NVRAM_AS1;
-static int nvram_as0 = NVRAM_AS0;
-static int nvram_data = NVRAM_DATA;
-
-long __init chrp_time_init(void)
-{
-        struct device_node *rtcs;
-        int base;
-
-        rtcs = find_compatible_devices("rtc", "pnpPNP,b00");
-        if (rtcs == NULL)
-                rtcs = find_compatible_devices("rtc", "ds1385-rtc");
-        if (rtcs == NULL || rtcs->addrs == NULL)
-                return 0;
-        base = rtcs->addrs[0].address;
-        nvram_as1 = 0;
-        nvram_as0 = base;
-        nvram_data = base + 1;
-
-        return 0;
-}
-
-int chrp_cmos_clock_read(int addr)
-{
-        if (nvram_as1 != 0)
-                outb(addr>>8, nvram_as1);
-        outb(addr, nvram_as0);
-        return (inb(nvram_data));
-}
-
-void chrp_cmos_clock_write(unsigned long val, int addr)
-{
-        if (nvram_as1 != 0)
-                outb(addr>>8, nvram_as1);
-        outb(addr, nvram_as0);
-        outb(val, nvram_data);
-        return;
-}
-
-/*
- * Set the hardware clock. -- Cort
- */
-int chrp_set_rtc_time(unsigned long nowtime)
-{
-        unsigned char save_control, save_freq_select;
-        struct rtc_time tm;
-
-        spin_lock(&rtc_lock);
-        to_tm(nowtime, &tm);
-
-        save_control = chrp_cmos_clock_read(RTC_CONTROL); /* tell the clock it's being set */
-
-        chrp_cmos_clock_write((save_control|RTC_SET), RTC_CONTROL);
-
-        save_freq_select = chrp_cmos_clock_read(RTC_FREQ_SELECT); /* stop and reset prescaler */
-
-        chrp_cmos_clock_write((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
-
-        tm.tm_year -= 1900;
-        if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-                BIN_TO_BCD(tm.tm_sec);
-                BIN_TO_BCD(tm.tm_min);
-                BIN_TO_BCD(tm.tm_hour);
-                BIN_TO_BCD(tm.tm_mon);
-                BIN_TO_BCD(tm.tm_mday);
-                BIN_TO_BCD(tm.tm_year);
-        }
-        chrp_cmos_clock_write(tm.tm_sec,RTC_SECONDS);
-        chrp_cmos_clock_write(tm.tm_min,RTC_MINUTES);
-        chrp_cmos_clock_write(tm.tm_hour,RTC_HOURS);
-        chrp_cmos_clock_write(tm.tm_mon,RTC_MONTH);
-        chrp_cmos_clock_write(tm.tm_mday,RTC_DAY_OF_MONTH);
-        chrp_cmos_clock_write(tm.tm_year,RTC_YEAR);
-
-        /* The following flags have to be released exactly in this order,
-         * otherwise the DS12887 (popular MC146818A clone with integrated
-         * battery and quartz) will not reset the oscillator and will not
-         * update precisely 500 ms later. You won't find this mentioned in
-         * the Dallas Semiconductor data sheets, but who believes data
-         * sheets anyway ...                           -- Markus Kuhn
-         */
-        chrp_cmos_clock_write(save_control, RTC_CONTROL);
-        chrp_cmos_clock_write(save_freq_select, RTC_FREQ_SELECT);
-
-        spin_unlock(&rtc_lock);
-        return 0;
-}
-
-unsigned long chrp_get_rtc_time(void)
-{
-        unsigned int year, mon, day, hour, min, sec;
-        int uip, i;
-
-        /* The Linux interpretation of the CMOS clock register contents:
-         * When the Update-In-Progress (UIP) flag goes from 1 to 0, the
-         * RTC registers show the second which has precisely just started.
-         * Let's hope other operating systems interpret the RTC the same way.
-         */
-
-        /* Since the UIP flag is set for about 2.2 ms and the clock
-         * is typically written with a precision of 1 jiffy, trying
-         * to obtain a precision better than a few milliseconds is
-         * an illusion. Only consistency is interesting, this also
-         * allows to use the routine for /dev/rtc without a potential
-         * 1 second kernel busy loop triggered by any reader of /dev/rtc.
-         */
-
-        for ( i = 0; i<1000000; i++) {
-                uip = chrp_cmos_clock_read(RTC_FREQ_SELECT);
-                sec = chrp_cmos_clock_read(RTC_SECONDS);
-                min = chrp_cmos_clock_read(RTC_MINUTES);
-                hour = chrp_cmos_clock_read(RTC_HOURS);
-                day = chrp_cmos_clock_read(RTC_DAY_OF_MONTH);
-                mon = chrp_cmos_clock_read(RTC_MONTH);
-                year = chrp_cmos_clock_read(RTC_YEAR);
-                uip |= chrp_cmos_clock_read(RTC_FREQ_SELECT);
-                if ((uip & RTC_UIP)==0) break;
-        }
-
-        if (!(chrp_cmos_clock_read(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
-          {
-            BCD_TO_BIN(sec);
-            BCD_TO_BIN(min);
-            BCD_TO_BIN(hour);
-            BCD_TO_BIN(day);
-            BCD_TO_BIN(mon);
-            BCD_TO_BIN(year);
-          }
-        if ((year += 1900) < 1970)
-                year += 100;
-        return mktime(year, mon, day, hour, min, sec);
-}
-
-/*
- * Calibrate the decrementer frequency with the VIA timer 1.
- */
-#define VIA_TIMER_FREQ_6        4700000 /* time 1 frequency * 6 */
-
-/* VIA registers */
-#define RS              0x200           /* skip between registers */
-#define T1CL            (4*RS)          /* Timer 1 ctr/latch (low 8 bits) */
-#define T1CH            (5*RS)          /* Timer 1 counter (high 8 bits) */
-#define T1LL            (6*RS)          /* Timer 1 latch (low 8 bits) */
-#define T1LH            (7*RS)          /* Timer 1 latch (high 8 bits) */
-#define ACR             (11*RS)         /* Auxiliary control register */
-#define IFR             (13*RS)         /* Interrupt flag register */
-
-/* Bits in ACR */
-#define T1MODE          0xc0            /* Timer 1 mode */
-#define T1MODE_CONT     0x40            /*  continuous interrupts */
-
-/* Bits in IFR and IER */
-#define T1_INT          0x40            /* Timer 1 interrupt */
-
-static int __init chrp_via_calibrate_decr(void)
-{
-        struct device_node *vias;
-        volatile unsigned char __iomem *via;
-        int count = VIA_TIMER_FREQ_6 / 100;
-        unsigned int dstart, dend;
-
-        vias = find_devices("via-cuda");
-        if (vias == 0)
-                vias = find_devices("via");
-        if (vias == 0 || vias->n_addrs == 0)
-                return 0;
-        via = ioremap(vias->addrs[0].address, vias->addrs[0].size);
-
-        /* set timer 1 for continuous interrupts */
-        out_8(&via[ACR], (via[ACR] & ~T1MODE) | T1MODE_CONT);
-        /* set the counter to a small value */
-        out_8(&via[T1CH], 2);
-        /* set the latch to `count' */
-        out_8(&via[T1LL], count);
-        out_8(&via[T1LH], count >> 8);
-        /* wait until it hits 0 */
-        while ((in_8(&via[IFR]) & T1_INT) == 0)
-                ;
-        dstart = get_dec();
-        /* clear the interrupt & wait until it hits 0 again */
-        in_8(&via[T1CL]);
-        while ((in_8(&via[IFR]) & T1_INT) == 0)
-                ;
-        dend = get_dec();
-
-        tb_ticks_per_jiffy = (dstart - dend) / ((6 * HZ)/100);
-        tb_to_us = mulhwu_scale_factor(dstart - dend, 60000);
-
-        printk(KERN_INFO "via_calibrate_decr: ticks per jiffy = %u (%u ticks)\n",
-               tb_ticks_per_jiffy, dstart - dend);
-
-        iounmap(via);
-        
-        return 1;
-}
-
-void __init chrp_calibrate_decr(void)
-{
-        struct device_node *cpu;
-        unsigned int freq, *fp;
-
-        if (chrp_via_calibrate_decr())
-                return;
-
-        /*
-         * The cpu node should have a timebase-frequency property
-         * to tell us the rate at which the decrementer counts.
-         */
-        freq = 16666000;                /* hardcoded default */
-        cpu = find_type_devices("cpu");
-        if (cpu != 0) {
-                fp = (unsigned int *)
-                        get_property(cpu, "timebase-frequency", NULL);
-                if (fp != 0)
-                        freq = *fp;
-        }
-        printk("time_init: decrementer frequency = %u.%.6u MHz\n",
-               freq/1000000, freq%1000000);
-        tb_ticks_per_jiffy = freq / HZ;
-        tb_to_us = mulhwu_scale_factor(freq, 1000000);
-}
diff --git a/arch/ppc/platforms/cpci690.c b/arch/ppc/platforms/cpci690.c
index 6ca7bcac9474..790475c22fd7 100644
--- a/arch/ppc/platforms/cpci690.c
+++ b/arch/ppc/platforms/cpci690.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/cpci690.c
- *
  * Board setup routines for the Force CPCI690 board.
  *
  * Author: Mark A. Greer <mgreer@mvista.com>
@@ -290,7 +288,7 @@ cpci690_fixup_mpsc_pdata(struct platform_device *pdev)
         pdata->brg_clk_freq = cpci690_get_bus_freq();
 }
 
-static int __init
+static int
 cpci690_platform_notify(struct device *dev)
 {
         static struct {
diff --git a/arch/ppc/platforms/cpci690.h b/arch/ppc/platforms/cpci690.h
index 49584c9cedf3..0fa5a4c31b67 100644
--- a/arch/ppc/platforms/cpci690.h
+++ b/arch/ppc/platforms/cpci690.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/cpci690.h
- *
  * Definitions for Force CPCI690
  *
  * Author: Mark A. Greer <mgreer@mvista.com>
diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c
index ffde8f6f6302..31e8e21e1d5c 100644
--- a/arch/ppc/platforms/ev64260.c
+++ b/arch/ppc/platforms/ev64260.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/ev64260.c
- *
  * Board setup routines for the Marvell/Galileo EV-64260-BP Evaluation Board.
  *
  * Author: Mark A. Greer <mgreer@mvista.com>
@@ -416,7 +414,7 @@ ev64260_fixup_mpsc_pdata(struct platform_device *pdev)
         return;
 }
 
-static int __init
+static int
 ev64260_platform_notify(struct device *dev)
 {
         static struct {
diff --git a/arch/ppc/platforms/ev64260.h b/arch/ppc/platforms/ev64260.h
index bedffced3a02..44d90d56745a 100644
--- a/arch/ppc/platforms/ev64260.h
+++ b/arch/ppc/platforms/ev64260.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/ev64260.h
- *
  * Definitions for Marvell/Galileo EV-64260-BP Evaluation Board.
  *
  * Author: Mark A. Greer <mgreer@mvista.com>
diff --git a/arch/ppc/platforms/ev64360.c b/arch/ppc/platforms/ev64360.c
index b9d844f88c2b..104ac9b16e8b 100644
--- a/arch/ppc/platforms/ev64360.c
+++ b/arch/ppc/platforms/ev64360.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/ev64360.c
- *
  * Board setup routines for the Marvell EV-64360-BP Evaluation Board.
  *
  * Author: Lee Nicks <allinux@gmail.com>
@@ -300,7 +298,7 @@ ev64360_fixup_eth_pdata(struct platform_device *pdev)
 }
 #endif
 
-static int __init
+static int
 ev64360_platform_notify(struct device *dev)
 {
         static struct {
diff --git a/arch/ppc/platforms/ev64360.h b/arch/ppc/platforms/ev64360.h
index 68eabe490397..b30f4722690a 100644
--- a/arch/ppc/platforms/ev64360.h
+++ b/arch/ppc/platforms/ev64360.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/ev64360.h
- *
  * Definitions for Marvell EV-64360-BP Evaluation Board.
  *
  * Author: Lee Nicks <allinux@gmail.com>
diff --git a/arch/ppc/platforms/fads.h b/arch/ppc/platforms/fads.h
index a48fb8d723e4..e1c0b1b6dcb3 100644
--- a/arch/ppc/platforms/fads.h
+++ b/arch/ppc/platforms/fads.h
@@ -112,7 +112,7 @@
 
 /* CPM Ethernet through SCC1 or SCC2 */
 
-#ifdef CONFIG_SCC1_ENET         /* Probably 860 variant */
+#if defined(CONFIG_SCC1_ENET) || defined(CONFIG_MPC8xx_SECOND_ETH_SCC1)         /* Probably 860 variant */
 /* Bits in parallel I/O port registers that have to be set/cleared
  * to configure the pins for SCC1 use.
  * TCLK - CLK1, RCLK - CLK2.
diff --git a/arch/ppc/platforms/gemini.h b/arch/ppc/platforms/gemini.h
index 06de59248918..5528fd0a1216 100644
--- a/arch/ppc/platforms/gemini.h
+++ b/arch/ppc/platforms/gemini.h
@@ -1,7 +1,4 @@
 /*
- *  arch/ppc/platforms/gemini.h
- *
- *
  *  Onboard registers and descriptions for Synergy Microsystems'
  *  "Gemini" boards.
  *
diff --git a/arch/ppc/platforms/gemini_prom.S b/arch/ppc/platforms/gemini_prom.S
index 8c5065d56505..b181f2108001 100644
--- a/arch/ppc/platforms/gemini_prom.S
+++ b/arch/ppc/platforms/gemini_prom.S
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/platforms/gemini_prom.S
- *
  *  Not really prom support code (yet), but sort of anti-prom code.  The current
  *  bootloader does a number of things it shouldn't and doesn't do things that it
  *  should.  The stuff in here is mainly a hodge-podge collection of setup code
diff --git a/arch/ppc/platforms/gemini_setup.c b/arch/ppc/platforms/gemini_setup.c
index 729897c59033..0090ff154608 100644
--- a/arch/ppc/platforms/gemini_setup.c
+++ b/arch/ppc/platforms/gemini_setup.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/platforms/gemini_setup.c
- *
  *  Copyright (C) 1995 Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
  *  Modified by Cort Dougan (cort@cs.nmt.edu)
diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c
index 50039a204c24..75dc2ee87d2f 100644
--- a/arch/ppc/platforms/hdpu.c
+++ b/arch/ppc/platforms/hdpu.c
@@ -1,7 +1,4 @@
-
 /*
- * arch/ppc/platforms/hdpu_setup.c
- *
  * Board setup routines for the Sky Computers HDPU Compute Blade.
  *
  * Written by Brian Waite <waite@skycomputers.com>
@@ -319,11 +316,10 @@ static void __init hdpu_fixup_eth_pdata(struct platform_device *pd)
         struct mv643xx_eth_platform_data *eth_pd;
         eth_pd = pd->dev.platform_data;
 
-        eth_pd->port_serial_control =
-            mv64x60_read(&bh, MV643XX_ETH_PORT_SERIAL_CONTROL_REG(pd->id) & ~1);
-
         eth_pd->force_phy_addr = 1;
         eth_pd->phy_addr = pd->id;
+        eth_pd->speed = SPEED_100;
+        eth_pd->duplex = DUPLEX_FULL;
         eth_pd->tx_queue_size = 400;
         eth_pd->rx_queue_size = 800;
 }
@@ -354,7 +350,7 @@ static void __init hdpu_fixup_cpustate_pdata(struct platform_device *pd)
 }
 #endif
 
-static int __init hdpu_platform_notify(struct device *dev)
+static int hdpu_platform_notify(struct device *dev)
 {
         static struct {
                 char *bus_id;
diff --git a/arch/ppc/platforms/hdpu.h b/arch/ppc/platforms/hdpu.h
index 07c3cffb5c7b..f9e020b6970c 100644
--- a/arch/ppc/platforms/hdpu.h
+++ b/arch/ppc/platforms/hdpu.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/hdpu.h
- *
  * Definitions for Sky Computers HDPU board.
  *
  * Brian Waite <waite@skycomputers.com>
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c
index 6e58e30ceed1..ad21280e8920 100644
--- a/arch/ppc/platforms/katana.c
+++ b/arch/ppc/platforms/katana.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/katana.c
- *
  * Board setup routines for the Artesyn Katana cPCI boards.
  *
  * Author: Tim Montgomery <timm@artesyncp.com>
@@ -598,7 +596,7 @@ katana_fixup_mv64xxx_pdata(struct platform_device *pdev)
 }
 #endif
 
-static int __init
+static int
 katana_platform_notify(struct device *dev)
 {
         static struct {
@@ -664,12 +662,11 @@ katana_setup_mtd(void)
 
         ptbl_entries = (size >= (64*MB)) ? 6 : 4;
 
-        if ((ptbl = kmalloc(ptbl_entries * sizeof(struct mtd_partition),
+        if ((ptbl = kcalloc(ptbl_entries, sizeof(struct mtd_partition),
                         GFP_KERNEL)) == NULL) {
                 printk(KERN_WARNING "Can't alloc MTD partition table\n");
                 return -ENOMEM;
         }
-        memset(ptbl, 0, ptbl_entries * sizeof(struct mtd_partition));
 
         ptbl[0].name = "Monitor";
         ptbl[0].size = KATANA_MTD_MONITOR_SIZE;
diff --git a/arch/ppc/platforms/katana.h b/arch/ppc/platforms/katana.h
index 597257eff2ec..0a9b036526b1 100644
--- a/arch/ppc/platforms/katana.h
+++ b/arch/ppc/platforms/katana.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/katana.h
- *
  * Definitions for Artesyn Katana750i/3750 board.
  *
  * Author: Tim Montgomery <timm@artesyncp.com>
diff --git a/arch/ppc/platforms/lite5200.c b/arch/ppc/platforms/lite5200.c
index 7ed52dc340c9..fecbe9adc9e0 100644
--- a/arch/ppc/platforms/lite5200.c
+++ b/arch/ppc/platforms/lite5200.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/lite5200.c
- *
  * Platform support file for the Freescale LITE5200 based on MPC52xx.
  * A maximum of this file should be moved to syslib/mpc52xx_?????
  * so that new platform based on MPC52xx need a minimal platform file
@@ -36,8 +34,7 @@
 #include <asm/mpc52xx.h>
 #include <asm/ppc_sys.h>
 #include <asm/machdep.h>
-
-#include <syslib/mpc52xx_pci.h>
+#include <asm/pci-bridge.h>
 
 
 extern int powersave_nap;
@@ -70,44 +67,53 @@ lite5200_show_cpuinfo(struct seq_file *m)
 }
 
 #ifdef CONFIG_PCI
+#ifdef CONFIG_LITE5200B
+static int
+lite5200_map_irq(struct pci_dev *dev, unsigned char idsel,
+                    unsigned char pin)
+{
+        static char pci_irq_table[][4] =
+        /*
+         *      PCI IDSEL/INTPIN->INTLINE
+         *        A             B             C             D
+         */
+        {
+                {MPC52xx_IRQ0, MPC52xx_IRQ1, MPC52xx_IRQ2, MPC52xx_IRQ3},
+                {MPC52xx_IRQ1, MPC52xx_IRQ2, MPC52xx_IRQ3, MPC52xx_IRQ0},
+        };
+
+        const long min_idsel = 24, max_idsel = 25, irqs_per_slot = 4;
+        return PCI_IRQ_TABLE_LOOKUP;
+}
+#else /* Original Lite */
 static int
 lite5200_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
 {
         return (pin == 1) && (idsel==24) ? MPC52xx_IRQ0 : -1;
 }
 #endif
+#endif
 
 static void __init
 lite5200_setup_cpu(void)
 {
-        struct mpc52xx_cdm  __iomem *cdm;
         struct mpc52xx_gpio __iomem *gpio;
         struct mpc52xx_intr __iomem *intr;
-        struct mpc52xx_xlb  __iomem *xlb;
 
         u32 port_config;
         u32 intr_ctrl;
 
         /* Map zones */
-        cdm  = ioremap(MPC52xx_PA(MPC52xx_CDM_OFFSET), MPC52xx_CDM_SIZE);
         gpio = ioremap(MPC52xx_PA(MPC52xx_GPIO_OFFSET), MPC52xx_GPIO_SIZE);
-        xlb  = ioremap(MPC52xx_PA(MPC52xx_XLB_OFFSET), MPC52xx_XLB_SIZE);
         intr = ioremap(MPC52xx_PA(MPC52xx_INTR_OFFSET), MPC52xx_INTR_SIZE);
 
-        if (!cdm || !gpio || !xlb || !intr) {
-                printk("lite5200.c: Error while mapping CDM/GPIO/XLB/INTR during"
-                                "lite5200_setup_cpu\n");
+        if (!gpio || !intr) {
+                printk(KERN_ERR __FILE__ ": "
+                        "Error while mapping GPIO/INTR during "
+                        "lite5200_setup_cpu\n");
                 goto unmap_regs;
         }
 
-        /* Use internal 48 Mhz */
-        out_8(&cdm->ext_48mhz_en, 0x00);
-        out_8(&cdm->fd_enable, 0x01);
-        if (in_be32(&cdm->rstcfg) & 0x40)       /* Assumes 33Mhz clock */
-                out_be16(&cdm->fd_counters, 0x0001);
-        else
-                out_be16(&cdm->fd_counters, 0x5555);
-
         /* Get port mux config */
         port_config = in_be32(&gpio->port_config);
 
@@ -118,29 +124,29 @@ lite5200_setup_cpu(void)
         port_config &= ~0x00007000;     /* Differential mode - USB1 only */
         port_config |=  0x00001000;
 
+        /* ATA CS is on csb_4/5 */
+        port_config &= ~0x03000000;
+        port_config |=  0x01000000;
+
         /* Commit port config */
         out_be32(&gpio->port_config, port_config);
 
-        /* Configure the XLB Arbiter */
-        out_be32(&xlb->master_pri_enable, 0xff);
-        out_be32(&xlb->master_priority, 0x11111111);
-
-        /* Enable ram snooping for 1GB window */
-        out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_SNOOP);
-        out_be32(&xlb->snoop_window, MPC52xx_PCI_TARGET_MEM | 0x1d);
-
-        /* IRQ[0-3] setup : IRQ0     - Level Active Low  */
-        /*                  IRQ[1-3] - Level Active High */
+        /* IRQ[0-3] setup */
         intr_ctrl = in_be32(&intr->ctrl);
         intr_ctrl &= ~0x00ff0000;
-        intr_ctrl |=  0x00c00000;
+#ifdef CONFIG_LITE5200B
+        /* IRQ[0-3] Level Active Low */
+        intr_ctrl |=  0x00ff0000;
+#else
+        /* IRQ0 Level Active Low
+         * IRQ[1-3] Level Active High */
+        intr_ctrl |=  0x00c00000;
+#endif
         out_be32(&intr->ctrl, intr_ctrl);
 
         /* Unmap reg zone */
 unmap_regs:
-        if (cdm)  iounmap(cdm);
         if (gpio) iounmap(gpio);
-        if (xlb)  iounmap(xlb);
         if (intr) iounmap(intr);
 }
 
@@ -148,7 +154,8 @@ static void __init
 lite5200_setup_arch(void)
 {
         /* CPU & Port mux setup */
-        lite5200_setup_cpu();
+        mpc52xx_setup_cpu();    /* Generic */
+        lite5200_setup_cpu();   /* Platform specific */
 
 #ifdef CONFIG_PCI
         /* PCI Bridge setup */
diff --git a/arch/ppc/platforms/lite5200.h b/arch/ppc/platforms/lite5200.h
index c1de2aa47175..852a18e24d0b 100644
--- a/arch/ppc/platforms/lite5200.h
+++ b/arch/ppc/platforms/lite5200.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/lite5200.h
- * 
  * Definitions for Freescale LITE5200 : MPC52xx Standard Development
  * Platform board support
  * 
diff --git a/arch/ppc/platforms/lopec.c b/arch/ppc/platforms/lopec.c
index 06d247c23b82..c6445a727ca3 100644
--- a/arch/ppc/platforms/lopec.c
+++ b/arch/ppc/platforms/lopec.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/lopec.c
- *
  * Setup routines for the Motorola LoPEC.
  *
  * Author: Dan Cox
diff --git a/arch/ppc/platforms/mpc8272ads_setup.c b/arch/ppc/platforms/mpc8272ads_setup.c
new file mode 100644
index 000000000000..bc9b94f77e39
--- /dev/null
+++ b/arch/ppc/platforms/mpc8272ads_setup.c
@@ -0,0 +1,236 @@
+/*
+ * arch/ppc/platforms/82xx/pq2ads_pd.c
+ *
+ * MPC82xx Board-specific PlatformDevice descriptions
+ *
+ * 2005 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/ioport.h>
+#include <linux/fs_enet_pd.h>
+#include <linux/platform_device.h>
+
+#include <asm/io.h>
+#include <asm/mpc8260.h>
+#include <asm/cpm2.h>
+#include <asm/immap_cpm2.h>
+#include <asm/irq.h>
+#include <asm/ppc_sys.h>
+#include <asm/ppcboot.h>
+
+#include "pq2ads_pd.h"
+
+static void init_fcc1_ioports(void);
+static void init_fcc2_ioports(void);
+
+static struct fs_mii_bus_info mii_bus_info = {
+        .method                 = fsmii_bitbang,
+        .id                     = 0,
+        .i.bitbang = {
+                .mdio_port      = fsiop_portc,
+                .mdio_bit       = 18,
+                .mdc_port       = fsiop_portc,
+                .mdc_bit        = 19,
+                .delay          = 1,
+        },
+};
+
+static struct fs_platform_info mpc82xx_fcc1_pdata = {
+        .fs_no          = fsid_fcc1,
+        .cp_page        = CPM_CR_FCC1_PAGE,
+        .cp_block       = CPM_CR_FCC1_SBLOCK,
+        .clk_trx        = (PC_F1RXCLK | PC_F1TXCLK),
+        .clk_route      = CMX1_CLK_ROUTE,
+        .clk_mask       = CMX1_CLK_MASK,
+        .init_ioports   = init_fcc1_ioports,
+
+        .phy_addr       = 0,
+#ifdef PHY_INTERRUPT
+        .phy_irq        = PHY_INTERRUPT,
+#else
+        .phy_irq        = -1;
+#endif
+        .mem_offset     = FCC1_MEM_OFFSET,
+        .bus_info       = &mii_bus_info,
+        .rx_ring        = 32,
+        .tx_ring        = 32,
+        .rx_copybreak   = 240,
+        .use_napi       = 0,
+        .napi_weight    = 17,
+};
+
+static struct fs_platform_info mpc82xx_fcc2_pdata = {
+        .fs_no          = fsid_fcc2,
+        .cp_page        = CPM_CR_FCC2_PAGE,
+        .cp_block       = CPM_CR_FCC2_SBLOCK,
+        .clk_trx        = (PC_F2RXCLK | PC_F2TXCLK),
+        .clk_route      = CMX2_CLK_ROUTE,
+        .clk_mask       = CMX2_CLK_MASK,
+        .init_ioports   = init_fcc2_ioports,
+
+        .phy_addr       = 3,
+#ifdef PHY_INTERRUPT
+        .phy_irq        = PHY_INTERRUPT,
+#else
+        .phy_irq        = -1;
+#endif
+        .mem_offset     = FCC2_MEM_OFFSET,
+        .bus_info       = &mii_bus_info,
+        .rx_ring        = 32,
+        .tx_ring        = 32,
+        .rx_copybreak   = 240,
+        .use_napi       = 0,
+        .napi_weight    = 17,
+};
+
+static void init_fcc1_ioports(void)
+{
+        struct io_port *io;
+        u32 tempval;
+        cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
+        u32 *bcsr = ioremap(BCSR_ADDR+4, sizeof(u32));
+
+        io = &immap->im_ioport;
+
+        /* Enable the PHY */
+        clrbits32(bcsr, BCSR1_FETHIEN);
+        setbits32(bcsr, BCSR1_FETH_RST);
+
+        /* FCC1 pins are on port A/C. */
+        /* Configure port A and C pins for FCC1 Ethernet. */
+
+        tempval = in_be32(&io->iop_pdira);
+        tempval &= ~PA1_DIRA0;
+        tempval |= PA1_DIRA1;
+        out_be32(&io->iop_pdira, tempval);
+
+        tempval = in_be32(&io->iop_psora);
+        tempval &= ~PA1_PSORA0;
+        tempval |= PA1_PSORA1;
+        out_be32(&io->iop_psora, tempval);
+
+        setbits32(&io->iop_ppara,PA1_DIRA0 | PA1_DIRA1);
+
+        /* Alter clocks */
+        tempval = PC_F1TXCLK|PC_F1RXCLK;
+
+        clrbits32(&io->iop_psorc, tempval);
+        clrbits32(&io->iop_pdirc, tempval);
+        setbits32(&io->iop_pparc, tempval);
+
+        clrbits32(&immap->im_cpmux.cmx_fcr, CMX1_CLK_MASK);
+        setbits32(&immap->im_cpmux.cmx_fcr, CMX1_CLK_ROUTE);
+        iounmap(bcsr);
+        iounmap(immap);
+}
+
+static void init_fcc2_ioports(void)
+{
+        cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
+        u32 *bcsr = ioremap(BCSR_ADDR+12, sizeof(u32));
+
+        struct io_port *io;
+        u32 tempval;
+
+        immap = cpm2_immr;
+
+        io = &immap->im_ioport;
+
+        /* Enable the PHY */
+        clrbits32(bcsr, BCSR3_FETHIEN2);
+        setbits32(bcsr, BCSR3_FETH2_RST);
+
+        /* FCC2 are port B/C. */
+        /* Configure port A and C pins for FCC2 Ethernet. */
+
+        tempval = in_be32(&io->iop_pdirb);
+        tempval &= ~PB2_DIRB0;
+        tempval |= PB2_DIRB1;
+        out_be32(&io->iop_pdirb, tempval);
+
+        tempval = in_be32(&io->iop_psorb);
+        tempval &= ~PB2_PSORB0;
+        tempval |= PB2_PSORB1;
+        out_be32(&io->iop_psorb, tempval);
+
+        setbits32(&io->iop_pparb,PB2_DIRB0 | PB2_DIRB1);
+
+        tempval = PC_F2RXCLK|PC_F2TXCLK;
+
+        /* Alter clocks */
+        clrbits32(&io->iop_psorc,tempval);
+        clrbits32(&io->iop_pdirc,tempval);
+        setbits32(&io->iop_pparc,tempval);
+
+        clrbits32(&immap->im_cpmux.cmx_fcr, CMX2_CLK_MASK);
+        setbits32(&immap->im_cpmux.cmx_fcr, CMX2_CLK_ROUTE);
+
+        iounmap(bcsr);
+        iounmap(immap);
+}
+
+
+static void __init mpc8272ads_fixup_enet_pdata(struct platform_device *pdev,
+                                              int idx)
+{
+        bd_t* bi = (void*)__res;
+        int fs_no = fsid_fcc1+pdev->id-1;
+
+        mpc82xx_fcc1_pdata.dpram_offset = mpc82xx_fcc2_pdata.dpram_offset = (u32)cpm2_immr->im_dprambase;
+        mpc82xx_fcc1_pdata.fcc_regs_c = mpc82xx_fcc2_pdata.fcc_regs_c = (u32)cpm2_immr->im_fcc_c;
+
+        switch(fs_no) {
+                case fsid_fcc1:
+                        memcpy(&mpc82xx_fcc1_pdata.macaddr,bi->bi_enetaddr,6);
+                        pdev->dev.platform_data = &mpc82xx_fcc1_pdata;
+                break;
+                case fsid_fcc2:
+                        memcpy(&mpc82xx_fcc2_pdata.macaddr,bi->bi_enetaddr,6);
+                        mpc82xx_fcc2_pdata.macaddr[5] ^= 1;
+                        pdev->dev.platform_data = &mpc82xx_fcc2_pdata;
+                break;
+        }
+}
+
+static int mpc8272ads_platform_notify(struct device *dev)
+{
+        static const struct platform_notify_dev_map dev_map[] = {
+                {
+                        .bus_id = "fsl-cpm-fcc",
+                        .rtn = mpc8272ads_fixup_enet_pdata
+                },
+                {
+                        .bus_id = NULL
+                }
+        };
+        platform_notify_map(dev_map,dev);
+
+        return 0;
+
+}
+
+int __init mpc8272ads_init(void)
+{
+        printk(KERN_NOTICE "mpc8272ads: Init\n");
+
+        platform_notify = mpc8272ads_platform_notify;
+
+        ppc_sys_device_initfunc();
+
+        ppc_sys_device_disable_all();
+        ppc_sys_device_enable(MPC82xx_CPM_FCC1);
+        ppc_sys_device_enable(MPC82xx_CPM_FCC2);
+
+        return 0;
+}
+
+arch_initcall(mpc8272ads_init);
diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c
new file mode 100644
index 000000000000..ac8fcc68afeb
--- /dev/null
+++ b/arch/ppc/platforms/mpc866ads_setup.c
@@ -0,0 +1,273 @@
+/*arch/ppc/platforms/mpc885ads-setup.c
+ *
+ * Platform setup for the Freescale mpc885ads board
+ *
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * Copyright 2005 MontaVista Software Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/param.h>
+#include <linux/string.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+
+#include <linux/fs_enet_pd.h>
+#include <linux/mii.h>
+
+#include <asm/delay.h>
+#include <asm/io.h>
+#include <asm/machdep.h>
+#include <asm/page.h>
+#include <asm/processor.h>
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/ppcboot.h>
+#include <asm/8xx_immap.h>
+#include <asm/commproc.h>
+#include <asm/ppc_sys.h>
+#include <asm/mpc8xx.h>
+
+extern unsigned char __res[];
+
+static struct fs_mii_bus_info fec_mii_bus_info = {
+        .method = fsmii_fec,
+        .id = 0,
+};
+
+static struct fs_mii_bus_info scc_mii_bus_info = {
+        .method = fsmii_fixed,
+        .id = 0,
+        .i.fixed.speed = 10,
+        .i.fixed.duplex = 0,
+};
+
+static struct fs_platform_info mpc8xx_fec_pdata[] = {
+        {
+         .rx_ring = 128,
+         .tx_ring = 16,
+         .rx_copybreak = 240,
+
+         .use_napi = 1,
+         .napi_weight = 17,
+
+         .phy_addr = 15,
+         .phy_irq = -1,
+
+         .use_rmii = 0,
+
+         .bus_info = &fec_mii_bus_info,
+         }
+};
+
+static struct fs_platform_info mpc8xx_scc_pdata = {
+        .rx_ring = 64,
+        .tx_ring = 8,
+        .rx_copybreak = 240,
+
+        .use_napi = 1,
+        .napi_weight = 17,
+
+        .phy_addr = -1,
+        .phy_irq = -1,
+
+        .bus_info = &scc_mii_bus_info,
+};
+
+void __init board_init(void)
+{
+        volatile cpm8xx_t *cp = cpmp;
+        unsigned *bcsr_io;
+
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR1\n");
+                return;
+        }
+#ifdef CONFIG_SERIAL_CPM_SMC1
+        cp->cp_simode &= ~(0xe0000000 >> 17);   /* brg1 */
+        clrbits32(bcsr_io,(0x80000000 >> 7));
+#else
+        setbits32(bcsr_io,(0x80000000 >> 7));
+
+        cp->cp_pbpar &= ~(0x000000c0);
+        cp->cp_pbdir |= 0x000000c0;
+        cp->cp_smc[0].smc_smcmr = 0;
+        cp->cp_smc[0].smc_smce = 0;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SMC2
+        cp->cp_simode &= ~(0xe0000000 >> 1);
+        cp->cp_simode |= (0x20000000 >> 1);     /* brg2 */
+        clrbits32(bcsr_io,(0x80000000 >> 13));
+#else
+        clrbits32(bcsr_io,(0x80000000 >> 13));
+        cp->cp_pbpar &= ~(0x00000c00);
+        cp->cp_pbdir |= 0x00000c00;
+        cp->cp_smc[1].smc_smcmr = 0;
+        cp->cp_smc[1].smc_smce = 0;
+#endif
+        iounmap(bcsr_io);
+}
+
+static void setup_fec1_ioports(void)
+{
+        immap_t *immap = (immap_t *) IMAP_ADDR;
+
+        setbits16(&immap->im_ioport.iop_pdpar, 0x1fff);
+        setbits16(&immap->im_ioport.iop_pddir, 0x1fff);
+}
+
+static void setup_scc1_ioports(void)
+{
+        immap_t *immap = (immap_t *) IMAP_ADDR;
+        unsigned *bcsr_io;
+
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR1\n");
+                return;
+        }
+
+        /* Enable the PHY.
+         */
+        clrbits32(bcsr_io,BCSR1_ETHEN);
+
+        /* Configure port A pins for Txd and Rxd.
+         */
+        /* Disable receive and transmit in case EPPC-Bug started it.
+         */
+        setbits16(&immap->im_ioport.iop_papar, PA_ENET_RXD | PA_ENET_TXD);
+        clrbits16(&immap->im_ioport.iop_padir, PA_ENET_RXD | PA_ENET_TXD);
+        clrbits16(&immap->im_ioport.iop_paodr, PA_ENET_TXD);
+
+        /* Configure port C pins to enable CLSN and RENA.
+         */
+        clrbits16(&immap->im_ioport.iop_pcpar, PC_ENET_CLSN | PC_ENET_RENA);
+        clrbits16(&immap->im_ioport.iop_pcdir, PC_ENET_CLSN | PC_ENET_RENA);
+        setbits16(&immap->im_ioport.iop_pcso, PC_ENET_CLSN | PC_ENET_RENA);
+        /* Configure port A for TCLK and RCLK.
+         */
+        setbits16(&immap->im_ioport.iop_papar, PA_ENET_TCLK | PA_ENET_RCLK);
+        clrbits16(&immap->im_ioport.iop_padir, PA_ENET_TCLK | PA_ENET_RCLK);
+        clrbits32(&immap->im_cpm.cp_pbpar, PB_ENET_TENA);
+        clrbits32(&immap->im_cpm.cp_pbdir, PB_ENET_TENA);
+
+        /* Configure Serial Interface clock routing.
+         * First, clear all SCC bits to zero, then set the ones we want.
+         */
+        clrbits32(&immap->im_cpm.cp_sicr, SICR_ENET_MASK);
+        setbits32(&immap->im_cpm.cp_sicr, SICR_ENET_CLKRT);
+
+        /* In the original SCC enet driver the following code is placed at
+        the end of the initialization */
+        setbits32(&immap->im_cpm.cp_pbpar, PB_ENET_TENA);
+        setbits32(&immap->im_cpm.cp_pbdir, PB_ENET_TENA);
+
+}
+
+static void mpc866ads_fixup_enet_pdata(struct platform_device *pdev, int fs_no)
+{
+        struct fs_platform_info *fpi = pdev->dev.platform_data;
+
+        volatile cpm8xx_t *cp;
+        bd_t *bd = (bd_t *) __res;
+        char *e;
+        int i;
+
+        /* Get pointer to Communication Processor */
+        cp = cpmp;
+        switch (fs_no) {
+        case fsid_fec1:
+                fpi = &mpc8xx_fec_pdata[0];
+                fpi->init_ioports = &setup_fec1_ioports;
+
+                break;
+        case fsid_scc1:
+                fpi = &mpc8xx_scc_pdata;
+                fpi->init_ioports = &setup_scc1_ioports;
+
+                break;
+        default:
+                printk(KERN_WARNING"Device %s is not supported!\n", pdev->name);
+                return;
+        }
+
+        pdev->dev.platform_data = fpi;
+        fpi->fs_no = fs_no;
+
+        e = (unsigned char *)&bd->bi_enetaddr;
+        for (i = 0; i < 6; i++)
+                fpi->macaddr[i] = *e++;
+
+        fpi->macaddr[5 - pdev->id]++;
+
+}
+
+static void mpc866ads_fixup_fec_enet_pdata(struct platform_device *pdev,
+                                           int idx)
+{
+        /* This is for FEC devices only */
+        if (!pdev || !pdev->name || (!strstr(pdev->name, "fsl-cpm-fec")))
+                return;
+        mpc866ads_fixup_enet_pdata(pdev, fsid_fec1 + pdev->id - 1);
+}
+
+static void mpc866ads_fixup_scc_enet_pdata(struct platform_device *pdev,
+                                           int idx)
+{
+        /* This is for SCC devices only */
+        if (!pdev || !pdev->name || (!strstr(pdev->name, "fsl-cpm-scc")))
+                return;
+
+        mpc866ads_fixup_enet_pdata(pdev, fsid_scc1 + pdev->id - 1);
+}
+
+static int mpc866ads_platform_notify(struct device *dev)
+{
+        static const struct platform_notify_dev_map dev_map[] = {
+                {
+                        .bus_id = "fsl-cpm-fec",
+                        .rtn = mpc866ads_fixup_fec_enet_pdata,
+                },
+                {
+                        .bus_id = "fsl-cpm-scc",
+                        .rtn = mpc866ads_fixup_scc_enet_pdata,
+                },
+                {
+                        .bus_id = NULL
+                }
+        };
+
+        platform_notify_map(dev_map,dev);
+
+        return 0;
+}
+
+int __init mpc866ads_init(void)
+{
+        printk(KERN_NOTICE "mpc866ads: Init\n");
+
+        platform_notify = mpc866ads_platform_notify;
+
+        ppc_sys_device_initfunc();
+        ppc_sys_device_disable_all();
+
+#ifdef MPC8xx_SECOND_ETH_SCC1
+        ppc_sys_device_enable(MPC8xx_CPM_SCC1);
+#endif
+        ppc_sys_device_enable(MPC8xx_CPM_FEC1);
+
+        return 0;
+}
+
+arch_initcall(mpc866ads_init);
diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c
new file mode 100644
index 000000000000..50a99e5f7c68
--- /dev/null
+++ b/arch/ppc/platforms/mpc885ads_setup.c
@@ -0,0 +1,389 @@
+/*arch/ppc/platforms/mpc885ads-setup.c
+ *
+ * Platform setup for the Freescale mpc885ads board
+ *
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * Copyright 2005 MontaVista Software Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/param.h>
+#include <linux/string.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+
+#include <linux/fs_enet_pd.h>
+#include <linux/mii.h>
+
+#include <asm/delay.h>
+#include <asm/io.h>
+#include <asm/machdep.h>
+#include <asm/page.h>
+#include <asm/processor.h>
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/ppcboot.h>
+#include <asm/8xx_immap.h>
+#include <asm/commproc.h>
+#include <asm/ppc_sys.h>
+
+extern unsigned char __res[];
+
+static void __init mpc885ads_scc_phy_init(char);
+
+static struct fs_mii_bus_info fec_mii_bus_info = {
+        .method = fsmii_fec,
+        .id = 0,
+};
+
+static struct fs_mii_bus_info scc_mii_bus_info = {
+#ifdef CONFIG_SCC_ENET_8xx_FIXED
+        .method = fsmii_fixed,
+#else
+        .method = fsmii_fec,
+#endif
+
+        .id = 0,
+};
+
+static struct fs_platform_info mpc8xx_fec_pdata[] = {
+        {
+         .rx_ring = 128,
+         .tx_ring = 16,
+         .rx_copybreak = 240,
+
+         .use_napi = 1,
+         .napi_weight = 17,
+
+         .phy_addr = 0,
+         .phy_irq = SIU_IRQ7,
+
+         .bus_info = &fec_mii_bus_info,
+         }, {
+             .rx_ring = 128,
+             .tx_ring = 16,
+             .rx_copybreak = 240,
+
+             .use_napi = 1,
+             .napi_weight = 17,
+
+             .phy_addr = 1,
+             .phy_irq = SIU_IRQ7,
+
+             .bus_info = &fec_mii_bus_info,
+             }
+};
+
+static struct fs_platform_info mpc8xx_scc_pdata = {
+        .rx_ring = 64,
+        .tx_ring = 8,
+        .rx_copybreak = 240,
+
+        .use_napi = 1,
+        .napi_weight = 17,
+
+        .phy_addr = 2,
+#ifdef CONFIG_MPC8xx_SCC_ENET_FIXED
+        .phy_irq = -1,
+#else
+        .phy_irq = SIU_IRQ7,
+#endif
+
+        .bus_info = &scc_mii_bus_info,
+};
+
+void __init board_init(void)
+{
+        volatile cpm8xx_t *cp = cpmp;
+        unsigned int *bcsr_io;
+
+#ifdef CONFIG_FS_ENET
+        immap_t *immap = (immap_t *) IMAP_ADDR;
+#endif
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR\n");
+                return;
+        }
+#ifdef CONFIG_SERIAL_CPM_SMC1
+        cp->cp_simode &= ~(0xe0000000 >> 17);   /* brg1 */
+        clrbits32(bcsr_io, BCSR1_RS232EN_1);
+#else
+        setbits32(bcsr_io,BCSR1_RS232EN_1);
+        cp->cp_smc[0].smc_smcmr = 0;
+        cp->cp_smc[0].smc_smce = 0;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SMC2
+        cp->cp_simode &= ~(0xe0000000 >> 1);
+        cp->cp_simode |= (0x20000000 >> 1);     /* brg2 */
+        clrbits32(bcsr_io,BCSR1_RS232EN_2);
+#else
+        setbits32(bcsr_io,BCSR1_RS232EN_2);
+        cp->cp_smc[1].smc_smcmr = 0;
+        cp->cp_smc[1].smc_smce = 0;
+#endif
+        iounmap(bcsr_io);
+
+#ifdef CONFIG_FS_ENET
+        /* use MDC for MII (common) */
+        setbits16(&immap->im_ioport.iop_pdpar, 0x0080);
+        clrbits16(&immap->im_ioport.iop_pddir, 0x0080);
+#endif
+}
+
+static void setup_fec1_ioports(void)
+{
+        immap_t *immap = (immap_t *) IMAP_ADDR;
+
+        /* configure FEC1 pins  */
+        setbits16(&immap->im_ioport.iop_papar, 0xf830);
+        setbits16(&immap->im_ioport.iop_padir, 0x0830);
+        clrbits16(&immap->im_ioport.iop_padir, 0xf000);
+        setbits32(&immap->im_cpm.cp_pbpar, 0x00001001);
+
+        clrbits32(&immap->im_cpm.cp_pbdir, 0x00001001);
+        setbits16(&immap->im_ioport.iop_pcpar, 0x000c);
+        clrbits16(&immap->im_ioport.iop_pcdir, 0x000c);
+        setbits32(&immap->im_cpm.cp_pepar, 0x00000003);
+
+        setbits32(&immap->im_cpm.cp_pedir, 0x00000003);
+        clrbits32(&immap->im_cpm.cp_peso, 0x00000003);
+        clrbits32(&immap->im_cpm.cp_cptr, 0x00000100);
+}
+
+static void setup_fec2_ioports(void)
+{
+        immap_t *immap = (immap_t *) IMAP_ADDR;
+
+        /* configure FEC2 pins */
+        setbits32(&immap->im_cpm.cp_pepar, 0x0003fffc);
+        setbits32(&immap->im_cpm.cp_pedir, 0x0003fffc);
+        setbits32(&immap->im_cpm.cp_peso, 0x00037800);
+        clrbits32(&immap->im_cpm.cp_peso, 0x000087fc);
+        clrbits32(&immap->im_cpm.cp_cptr, 0x00000080);
+}
+
+static void setup_scc3_ioports(void)
+{
+        immap_t *immap = (immap_t *) IMAP_ADDR;
+        unsigned *bcsr_io;
+
+        bcsr_io = ioremap(BCSR_ADDR, BCSR_SIZE);
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR\n");
+                return;
+        }
+
+        /* Enable the PHY.
+         */
+        setbits32(bcsr_io+4, BCSR4_ETH10_RST);
+        /* Configure port A pins for Txd and Rxd.
+         */
+        setbits16(&immap->im_ioport.iop_papar, PA_ENET_RXD | PA_ENET_TXD);
+        clrbits16(&immap->im_ioport.iop_padir, PA_ENET_RXD | PA_ENET_TXD);
+
+        /* Configure port C pins to enable CLSN and RENA.
+         */
+        clrbits16(&immap->im_ioport.iop_pcpar, PC_ENET_CLSN | PC_ENET_RENA);
+        clrbits16(&immap->im_ioport.iop_pcdir, PC_ENET_CLSN | PC_ENET_RENA);
+        setbits16(&immap->im_ioport.iop_pcso, PC_ENET_CLSN | PC_ENET_RENA);
+
+        /* Configure port E for TCLK and RCLK.
+         */
+        setbits32(&immap->im_cpm.cp_pepar, PE_ENET_TCLK | PE_ENET_RCLK);
+        clrbits32(&immap->im_cpm.cp_pepar, PE_ENET_TENA);
+        clrbits32(&immap->im_cpm.cp_pedir,
+                  PE_ENET_TCLK | PE_ENET_RCLK | PE_ENET_TENA);
+        clrbits32(&immap->im_cpm.cp_peso, PE_ENET_TCLK | PE_ENET_RCLK);
+        setbits32(&immap->im_cpm.cp_peso, PE_ENET_TENA);
+
+        /* Configure Serial Interface clock routing.
+         * First, clear all SCC bits to zero, then set the ones we want.
+         */
+        clrbits32(&immap->im_cpm.cp_sicr, SICR_ENET_MASK);
+        setbits32(&immap->im_cpm.cp_sicr, SICR_ENET_CLKRT);
+
+        /* Disable Rx and Tx. SMC1 sshould be stopped if SCC3 eternet are used.
+         */
+        immap->im_cpm.cp_smc[0].smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
+        /* On the MPC885ADS SCC ethernet PHY is initialized in the full duplex mode
+         * by H/W setting after reset. SCC ethernet controller support only half duplex.
+         * This discrepancy of modes causes a lot of carrier lost errors.
+         */
+
+        /* In the original SCC enet driver the following code is placed at
+           the end of the initialization */
+        setbits32(&immap->im_cpm.cp_pepar, PE_ENET_TENA);
+        clrbits32(&immap->im_cpm.cp_pedir, PE_ENET_TENA);
+        setbits32(&immap->im_cpm.cp_peso, PE_ENET_TENA);
+
+        setbits32(bcsr_io+1, BCSR1_ETHEN);
+        iounmap(bcsr_io);
+}
+
+static void mpc885ads_fixup_enet_pdata(struct platform_device *pdev, int fs_no)
+{
+        struct fs_platform_info *fpi = pdev->dev.platform_data;
+
+        volatile cpm8xx_t *cp;
+        bd_t *bd = (bd_t *) __res;
+        char *e;
+        int i;
+
+        /* Get pointer to Communication Processor */
+        cp = cpmp;
+        switch (fs_no) {
+        case fsid_fec1:
+                fpi = &mpc8xx_fec_pdata[0];
+                fpi->init_ioports = &setup_fec1_ioports;
+                break;
+        case fsid_fec2:
+                fpi = &mpc8xx_fec_pdata[1];
+                fpi->init_ioports = &setup_fec2_ioports;
+                break;
+        case fsid_scc3:
+                fpi = &mpc8xx_scc_pdata;
+                fpi->init_ioports = &setup_scc3_ioports;
+                mpc885ads_scc_phy_init(fpi->phy_addr);
+                break;
+        default:
+                printk(KERN_WARNING"Device %s is not supported!\n", pdev->name);
+                return;
+        }
+
+        pdev->dev.platform_data = fpi;
+        fpi->fs_no = fs_no;
+
+        e = (unsigned char *)&bd->bi_enetaddr;
+        for (i = 0; i < 6; i++)
+                fpi->macaddr[i] = *e++;
+
+        fpi->macaddr[5 - pdev->id]++;
+
+}
+
+static void mpc885ads_fixup_fec_enet_pdata(struct platform_device *pdev,
+                                           int idx)
+{
+        /* This is for FEC devices only */
+        if (!pdev || !pdev->name || (!strstr(pdev->name, "fsl-cpm-fec")))
+                return;
+        mpc885ads_fixup_enet_pdata(pdev, fsid_fec1 + pdev->id - 1);
+}
+
+static void __init mpc885ads_fixup_scc_enet_pdata(struct platform_device *pdev,
+                                                  int idx)
+{
+        /* This is for SCC devices only */
+        if (!pdev || !pdev->name || (!strstr(pdev->name, "fsl-cpm-scc")))
+                return;
+
+        mpc885ads_fixup_enet_pdata(pdev, fsid_scc1 + pdev->id - 1);
+}
+
+/* SCC ethernet controller does not have MII management channel. FEC1 MII
+ * channel is used to communicate with the 10Mbit PHY.
+ */
+
+#define MII_ECNTRL_PINMUX        0x4
+#define FEC_ECNTRL_PINMUX        0x00000004
+#define FEC_RCNTRL_MII_MODE        0x00000004
+
+/* Make MII read/write commands.
+ */
+#define mk_mii_write(REG, VAL, PHY_ADDR)    (0x50020000 | (((REG) & 0x1f) << 18) | \
+                ((VAL) & 0xffff) | ((PHY_ADDR) << 23))
+
+static void mpc885ads_scc_phy_init(char phy_addr)
+{
+        volatile immap_t *immap;
+        volatile fec_t *fecp;
+        bd_t *bd;
+
+        bd = (bd_t *) __res;
+        immap = (immap_t *) IMAP_ADDR;  /* pointer to internal registers */
+        fecp = &(immap->im_cpm.cp_fec);
+
+        /* Enable MII pins of the FEC1
+         */
+        setbits16(&immap->im_ioport.iop_pdpar, 0x0080);
+        clrbits16(&immap->im_ioport.iop_pddir, 0x0080);
+        /* Set MII speed to 2.5 MHz
+         */
+        out_be32(&fecp->fec_mii_speed,
+                 ((((bd->bi_intfreq + 4999999) / 2500000) / 2) & 0x3F) << 1);
+
+        /* Enable FEC pin MUX
+         */
+        setbits32(&fecp->fec_ecntrl, MII_ECNTRL_PINMUX);
+        setbits32(&fecp->fec_r_cntrl, FEC_RCNTRL_MII_MODE);
+
+        out_be32(&fecp->fec_mii_data,
+                 mk_mii_write(MII_BMCR, BMCR_ISOLATE, phy_addr));
+        udelay(100);
+        out_be32(&fecp->fec_mii_data,
+                 mk_mii_write(MII_ADVERTISE,
+                              ADVERTISE_10HALF | ADVERTISE_CSMA, phy_addr));
+        udelay(100);
+
+        /* Disable FEC MII settings
+         */
+        clrbits32(&fecp->fec_ecntrl, MII_ECNTRL_PINMUX);
+        clrbits32(&fecp->fec_r_cntrl, FEC_RCNTRL_MII_MODE);
+        out_be32(&fecp->fec_mii_speed, 0);
+}
+
+static int mpc885ads_platform_notify(struct device *dev)
+{
+
+        static const struct platform_notify_dev_map dev_map[] = {
+                {
+                        .bus_id = "fsl-cpm-fec",
+                        .rtn = mpc885ads_fixup_fec_enet_pdata,
+                },
+                {
+                        .bus_id = "fsl-cpm-scc",
+                        .rtn = mpc885ads_fixup_scc_enet_pdata,
+                },
+                {
+                        .bus_id = NULL
+                }
+        };
+
+        platform_notify_map(dev_map,dev);
+
+}
+
+int __init mpc885ads_init(void)
+{
+        printk(KERN_NOTICE "mpc885ads: Init\n");
+
+        platform_notify = mpc885ads_platform_notify;
+
+        ppc_sys_device_initfunc();
+        ppc_sys_device_disable_all();
+
+        ppc_sys_device_enable(MPC8xx_CPM_FEC1);
+
+#ifdef CONFIG_MPC8xx_SECOND_ETH_SCC3
+        ppc_sys_device_enable(MPC8xx_CPM_SCC1);
+
+#endif
+#ifdef CONFIG_MPC8xx_SECOND_ETH_FEC2
+        ppc_sys_device_enable(MPC8xx_CPM_FEC2);
+#endif
+
+        return 0;
+}
+
+arch_initcall(mpc885ads_init);
diff --git a/arch/ppc/platforms/mvme5100.c b/arch/ppc/platforms/mvme5100.c
index 108eb182dddc..c717cd92c028 100644
--- a/arch/ppc/platforms/mvme5100.c
+++ b/arch/ppc/platforms/mvme5100.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/mvme5100.c
- *
  * Board setup routines for the Motorola MVME5100.
  *
  * Author: Matt Porter <mporter@mvista.com>
diff --git a/arch/ppc/platforms/pal4.h b/arch/ppc/platforms/pal4.h
index 641a11a31657..8569c423d887 100644
--- a/arch/ppc/platforms/pal4.h
+++ b/arch/ppc/platforms/pal4.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/pal4.h
- *
  * Definitions for SBS Palomar IV board
  *
  * Author: Dan Cox
diff --git a/arch/ppc/platforms/pal4_pci.c b/arch/ppc/platforms/pal4_pci.c
index c3b1b757a48b..d81ae1c7e1cf 100644
--- a/arch/ppc/platforms/pal4_pci.c
+++ b/arch/ppc/platforms/pal4_pci.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/pal4_pci.c
- *
  * PCI support for SBS Palomar IV
  *
  * Author: Dan Cox
diff --git a/arch/ppc/platforms/pal4_serial.h b/arch/ppc/platforms/pal4_serial.h
index a715c66e1adf..a75343224cfd 100644
--- a/arch/ppc/platforms/pal4_serial.h
+++ b/arch/ppc/platforms/pal4_serial.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/pal4_serial.h
- *
  * Definitions for SBS PalomarIV serial support
  *
  * Author: Dan Cox
diff --git a/arch/ppc/platforms/pal4_setup.c b/arch/ppc/platforms/pal4_setup.c
index f93a3f871932..3c3d881df00d 100644
--- a/arch/ppc/platforms/pal4_setup.c
+++ b/arch/ppc/platforms/pal4_setup.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/pal4_setup.c
- *
  * Board setup routines for the SBS PalomarIV.
  *
  * Author: Dan Cox
diff --git a/arch/ppc/platforms/powerpmc250.c b/arch/ppc/platforms/powerpmc250.c
index e6b520e6e13f..c3a86be11fb7 100644
--- a/arch/ppc/platforms/powerpmc250.c
+++ b/arch/ppc/platforms/powerpmc250.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/powerpmc250.c
- *
  * Board setup routines for Force PowerPMC-250 Processor PMC
  *
  * Author: Troy Benjegerdes <tbenjegerdes@mvista.com>
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c
index 22bd40cfb092..de2761ebe0d9 100644
--- a/arch/ppc/platforms/pplus.c
+++ b/arch/ppc/platforms/pplus.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/pplus.c
- *
  * Board and PCI setup routines for MCG PowerPlus
  *
  * Author: Randy Vinson <rvinson@mvista.com>
diff --git a/arch/ppc/platforms/pplus.h b/arch/ppc/platforms/pplus.h
index 90f0cb2d409f..a07cbbdd72c6 100644
--- a/arch/ppc/platforms/pplus.h
+++ b/arch/ppc/platforms/pplus.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/pplus.h
- *
  * Definitions for Motorola MCG Falcon/Raven & HAWK North Bridge & Memory ctlr.
  *
  * Author: Mark A. Greerinclude/asm-ppc/hawk.h
diff --git a/arch/ppc/platforms/pq2ads.c b/arch/ppc/platforms/pq2ads.c
index 71c9fca1fe9b..3365fd788a7a 100644
--- a/arch/ppc/platforms/pq2ads.c
+++ b/arch/ppc/platforms/pq2ads.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/pq2ads.c
- *
  * PQ2ADS platform support
  *
  * Author: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/platforms/pq2ads.h b/arch/ppc/platforms/pq2ads.h
index 067d9a5aebc1..6b26dd36c640 100644
--- a/arch/ppc/platforms/pq2ads.h
+++ b/arch/ppc/platforms/pq2ads.h
@@ -13,6 +13,10 @@
 
 #include <asm/ppcboot.h>
 
+#if defined(CONFIG_ADS8272)
+#define BOARD_CHIP_NAME "8272"
+#endif
+
 /* Memory map is configured by the PROM startup.
  * We just map a few things we need.  The CSR is actually 4 byte-wide
  * registers that can be accessed as 8-, 16-, or 32-bit values.
diff --git a/arch/ppc/platforms/pq2ads_pd.h b/arch/ppc/platforms/pq2ads_pd.h
new file mode 100644
index 000000000000..8f14a43eafec
--- /dev/null
+++ b/arch/ppc/platforms/pq2ads_pd.h
@@ -0,0 +1,114 @@
+#ifndef __PQ2ADS_PD_H
+#define __PQ2ADS_PD_H
+/*
+ * arch/ppc/platforms/82xx/pq2ads_pd.h
+ *
+ * Some defines for MPC82xx board-specific PlatformDevice descriptions
+ *
+ * 2005 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/* FCC1 Clock Source Configuration.  These can be redefined in the board specific file.
+   Can only choose from CLK9-12 */
+
+#define F1_RXCLK        11
+#define F1_TXCLK        10
+
+/* FCC2 Clock Source Configuration.  These can be redefined in the board specific file.
+   Can only choose from CLK13-16 */
+#define F2_RXCLK        15
+#define F2_TXCLK        16
+
+/* FCC3 Clock Source Configuration.  These can be redefined in the board specific file.
+   Can only choose from CLK13-16 */
+#define F3_RXCLK        13
+#define F3_TXCLK        14
+
+/* Automatically generates register configurations */
+#define PC_CLK(x)       ((uint)(1<<(x-1)))      /* FCC CLK I/O ports */
+
+#define CMXFCR_RF1CS(x) ((uint)((x-5)<<27))     /* FCC1 Receive Clock Source */
+#define CMXFCR_TF1CS(x) ((uint)((x-5)<<24))     /* FCC1 Transmit Clock Source */
+#define CMXFCR_RF2CS(x) ((uint)((x-9)<<19))     /* FCC2 Receive Clock Source */
+#define CMXFCR_TF2CS(x) ((uint)((x-9)<<16))     /* FCC2 Transmit Clock Source */
+#define CMXFCR_RF3CS(x) ((uint)((x-9)<<11))     /* FCC3 Receive Clock Source */
+#define CMXFCR_TF3CS(x) ((uint)((x-9)<<8))      /* FCC3 Transmit Clock Source */
+
+#define PC_F1RXCLK      PC_CLK(F1_RXCLK)
+#define PC_F1TXCLK      PC_CLK(F1_TXCLK)
+#define CMX1_CLK_ROUTE  (CMXFCR_RF1CS(F1_RXCLK) | CMXFCR_TF1CS(F1_TXCLK))
+#define CMX1_CLK_MASK   ((uint)0xff000000)
+
+#define PC_F2RXCLK      PC_CLK(F2_RXCLK)
+#define PC_F2TXCLK      PC_CLK(F2_TXCLK)
+#define CMX2_CLK_ROUTE  (CMXFCR_RF2CS(F2_RXCLK) | CMXFCR_TF2CS(F2_TXCLK))
+#define CMX2_CLK_MASK   ((uint)0x00ff0000)
+
+#define PC_F3RXCLK      PC_CLK(F3_RXCLK)
+#define PC_F3TXCLK      PC_CLK(F3_TXCLK)
+#define CMX3_CLK_ROUTE  (CMXFCR_RF3CS(F3_RXCLK) | CMXFCR_TF3CS(F3_TXCLK))
+#define CMX3_CLK_MASK   ((uint)0x0000ff00)
+
+/* I/O Pin assignment for FCC1.  I don't yet know the best way to do this,
+ * but there is little variation among the choices.
+ */
+#define PA1_COL         0x00000001U
+#define PA1_CRS         0x00000002U
+#define PA1_TXER        0x00000004U
+#define PA1_TXEN        0x00000008U
+#define PA1_RXDV        0x00000010U
+#define PA1_RXER        0x00000020U
+#define PA1_TXDAT       0x00003c00U
+#define PA1_RXDAT       0x0003c000U
+#define PA1_PSORA0      (PA1_RXDAT | PA1_TXDAT)
+#define PA1_PSORA1      (PA1_COL | PA1_CRS | PA1_TXER | PA1_TXEN | \
+                PA1_RXDV | PA1_RXER)
+#define PA1_DIRA0       (PA1_RXDAT | PA1_CRS | PA1_COL | PA1_RXER | PA1_RXDV)
+#define PA1_DIRA1       (PA1_TXDAT | PA1_TXEN | PA1_TXER)
+
+
+/* I/O Pin assignment for FCC2.  I don't yet know the best way to do this,
+ * but there is little variation among the choices.
+ */
+#define PB2_TXER        0x00000001U
+#define PB2_RXDV        0x00000002U
+#define PB2_TXEN        0x00000004U
+#define PB2_RXER        0x00000008U
+#define PB2_COL         0x00000010U
+#define PB2_CRS         0x00000020U
+#define PB2_TXDAT       0x000003c0U
+#define PB2_RXDAT       0x00003c00U
+#define PB2_PSORB0      (PB2_RXDAT | PB2_TXDAT | PB2_CRS | PB2_COL | \
+                PB2_RXER | PB2_RXDV | PB2_TXER)
+#define PB2_PSORB1      (PB2_TXEN)
+#define PB2_DIRB0       (PB2_RXDAT | PB2_CRS | PB2_COL | PB2_RXER | PB2_RXDV)
+#define PB2_DIRB1       (PB2_TXDAT | PB2_TXEN | PB2_TXER)
+
+
+/* I/O Pin assignment for FCC3.  I don't yet know the best way to do this,
+ * but there is little variation among the choices.
+ */
+#define PB3_RXDV        0x00004000U
+#define PB3_RXER        0x00008000U
+#define PB3_TXER        0x00010000U
+#define PB3_TXEN        0x00020000U
+#define PB3_COL         0x00040000U
+#define PB3_CRS         0x00080000U
+#define PB3_TXDAT       0x0f000000U
+#define PB3_RXDAT       0x00f00000U
+#define PB3_PSORB0      (PB3_RXDAT | PB3_TXDAT | PB3_CRS | PB3_COL | \
+                PB3_RXER | PB3_RXDV | PB3_TXER | PB3_TXEN)
+#define PB3_PSORB1      0
+#define PB3_DIRB0       (PB3_RXDAT | PB3_CRS | PB3_COL | PB3_RXER | PB3_RXDV)
+#define PB3_DIRB1       (PB3_TXDAT | PB3_TXEN | PB3_TXER)
+
+#define FCC_MEM_OFFSET(x) (CPM_FCC_SPECIAL_BASE + (x*128))
+#define FCC1_MEM_OFFSET FCC_MEM_OFFSET(0)
+#define FCC2_MEM_OFFSET FCC_MEM_OFFSET(1)
+
+#endif
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index d06535802003..e86f6156d589 100644
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/platforms/setup.c
- *
  *  Copyright (C) 1995  Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
  *  Modified by Cort Dougan (cort@cs.nmt.edu)
@@ -738,7 +736,7 @@ ibm_statusled_progress(char *s, unsigned short hex)
                 hex = 0xfff;
                 if (!notifier_installed) {
                         ++notifier_installed;
-                        notifier_chain_register(&panic_notifier_list,
+                        atomic_notifier_chain_register(&panic_notifier_list,
                                                 &ibm_statusled_block);
                 }
         }
@@ -1069,15 +1067,13 @@ prep_map_io(void)
 static int __init
 prep_request_io(void)
 {
-        if (_machine == _MACH_prep) {
 #ifdef CONFIG_NVRAM
-                request_region(PREP_NVRAM_AS0, 0x8, "nvram");
+        request_region(PREP_NVRAM_AS0, 0x8, "nvram");
 #endif
-                request_region(0x00,0x20,"dma1");
-                request_region(0x40,0x20,"timer");
-                request_region(0x80,0x10,"dma page reg");
-                request_region(0xc0,0x20,"dma2");
-        }
+        request_region(0x00,0x20,"dma1");
+        request_region(0x40,0x20,"timer");
+        request_region(0x80,0x10,"dma page reg");
+        request_region(0xc0,0x20,"dma2");
 
         return 0;
 }
diff --git a/arch/ppc/platforms/prpmc750.c b/arch/ppc/platforms/prpmc750.c
index 0bb14a5e824c..cdd9cfb13ee9 100644
--- a/arch/ppc/platforms/prpmc750.c
+++ b/arch/ppc/platforms/prpmc750.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/prpmc750_setup.c
- *
  * Board setup routines for Motorola PrPMC750
  *
  * Author: Matt Porter <mporter@mvista.com>
diff --git a/arch/ppc/platforms/prpmc800.c b/arch/ppc/platforms/prpmc800.c
index de7baefacd3a..e459a199fb1d 100644
--- a/arch/ppc/platforms/prpmc800.c
+++ b/arch/ppc/platforms/prpmc800.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/prpmc800.c
- *
  * Author: Dale Farnsworth <dale.farnsworth@mvista.com>
  *
  * 2001-2004 (c) MontaVista, Software, Inc.  This file is licensed under
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index 872c0a3ba3c7..bc26b6d71c1d 100644
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/radstone_ppc7d.c
- *
  * Board setup routines for the Radstone PPC7D boards.
  *
  * Author: James Chapman <jchapman@katalix.com>
@@ -685,11 +683,10 @@ ppc7d_fixup_i2c_pdata(struct platform_device *pdev)
 
         pdata = pdev->dev.platform_data;
         if (pdata == NULL) {
-                pdata = kmalloc(sizeof(*pdata), GFP_KERNEL);
+                pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
                 if (pdata == NULL)
                         return;
 
-                memset(pdata, 0, sizeof(*pdata));
                 pdev->dev.platform_data = pdata;
         }
 
@@ -712,7 +709,7 @@ ppc7d_fixup_i2c_pdata(struct platform_device *pdev)
 }
 #endif
 
-static int __init ppc7d_platform_notify(struct device *dev)
+static int ppc7d_platform_notify(struct device *dev)
 {
         static struct {
                 char *bus_id;
diff --git a/arch/ppc/platforms/radstone_ppc7d.h b/arch/ppc/platforms/radstone_ppc7d.h
index 938375510be4..2bb093a0c03e 100644
--- a/arch/ppc/platforms/radstone_ppc7d.h
+++ b/arch/ppc/platforms/radstone_ppc7d.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/radstone_ppc7d.h
- *
  * Board definitions for the Radstone PPC7D boards.
  *
  * Author: James Chapman <jchapman@katalix.com>
diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
index 9eeed3572309..6dc459decb2d 100644
--- a/arch/ppc/platforms/sandpoint.c
+++ b/arch/ppc/platforms/sandpoint.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/sandpoint_setup.c
- *
  * Board setup routines for the Motorola SPS Sandpoint Test Platform.
  *
  * Author: Mark A. Greer
diff --git a/arch/ppc/platforms/sandpoint.h b/arch/ppc/platforms/sandpoint.h
index f4e982cb69df..3b64e6418489 100644
--- a/arch/ppc/platforms/sandpoint.h
+++ b/arch/ppc/platforms/sandpoint.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/sandpoint.h
- *
  * Definitions for Motorola SPS Sandpoint Test Platform
  *
  * Author: Mark A. Greer
diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c
index 74c9ff72c3dd..866807b4ad0b 100644
--- a/arch/ppc/platforms/sbc82xx.c
+++ b/arch/ppc/platforms/sbc82xx.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/sbc82xx.c
- *
  * SBC82XX platform support
  *
  * Author: Guy Streeter <streeter@redhat.com>
diff --git a/arch/ppc/platforms/spruce.c b/arch/ppc/platforms/spruce.c
index 69e1de7971f2..3783deccd9b2 100644
--- a/arch/ppc/platforms/spruce.c
+++ b/arch/ppc/platforms/spruce.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/spruce.c
- *
  * Board and PCI setup routines for IBM Spruce
  *
  * Author: MontaVista Software <source@mvista.com>
diff --git a/arch/ppc/platforms/tqm8260_setup.c b/arch/ppc/platforms/tqm8260_setup.c
index 3409139330b1..b766339f44ac 100644
--- a/arch/ppc/platforms/tqm8260_setup.c
+++ b/arch/ppc/platforms/tqm8260_setup.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/tqm8260_setup.c
- *
  * TQM8260 platform support
  *
  * Author: Allen Curtis <acurtis@onz.com>
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
index 159dcd92a6d1..490749ca88f9 100644
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
@@ -17,8 +17,8 @@ obj-$(CONFIG_440GX)		+= ibm440gx_common.o
 obj-$(CONFIG_440SP)             += ibm440gx_common.o ibm440sp_common.o
 obj-$(CONFIG_440SPE)            += ibm440gx_common.o ibm440sp_common.o ppc440spe_pcie.o
 ifeq ($(CONFIG_4xx),y)
-ifeq ($(CONFIG_VIRTEX_II_PRO),y)
-obj-$(CONFIG_40x)               += xilinx_pic.o
+ifeq ($(CONFIG_XILINX_VIRTEX),y)
+obj-$(CONFIG_40x)               += xilinx_pic.o ppc_sys.o
 else
 ifeq ($(CONFIG_403),y)
 obj-$(CONFIG_40x)               += ppc403_pic.o
@@ -38,8 +38,6 @@ endif
 obj-$(CONFIG_8xx)               += m8xx_setup.o ppc8xx_pic.o $(wdt-mpc8xx-y) \
                                    ppc_sys.o mpc8xx_devices.o mpc8xx_sys.o
 obj-$(CONFIG_PCI_QSPAN)         += qspan_pci.o
-obj-$(CONFIG_PPC_OF)            += prom_init.o prom.o
-obj-$(CONFIG_PPC_CHRP)          += open_pic.o
 obj-$(CONFIG_PPC_PREP)          += open_pic.o todc_time.o
 obj-$(CONFIG_BAMBOO)            += pci_auto.o todc_time.o
 obj-$(CONFIG_CPCI690)           += todc_time.o pci_auto.o
diff --git a/arch/ppc/syslib/cpc700.h b/arch/ppc/syslib/cpc700.h
index f2c002531019..0a8a5d84390f 100644
--- a/arch/ppc/syslib/cpc700.h
+++ b/arch/ppc/syslib/cpc700.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/cpc700.h
- *
  * Header file for IBM CPC700 Host Bridge, et. al.
  *
  * Author: Mark A. Greer
diff --git a/arch/ppc/syslib/cpc700_pic.c b/arch/ppc/syslib/cpc700_pic.c
index 75fe8eb10693..5add0a919ef6 100644
--- a/arch/ppc/syslib/cpc700_pic.c
+++ b/arch/ppc/syslib/cpc700_pic.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/cpc700_pic.c
- *
  * Interrupt controller support for IBM Spruce
  *
  * Authors: Mark Greer, Matt Porter, and Johnnie Peters
diff --git a/arch/ppc/syslib/cpc710.h b/arch/ppc/syslib/cpc710.h
index cc0afd804029..5299bf8b5d01 100644
--- a/arch/ppc/syslib/cpc710.h
+++ b/arch/ppc/syslib/cpc710.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/cpc710.h
- *
  * Definitions for the IBM CPC710 PCI Host Bridge
  *
  * Author: Matt Porter <mporter@mvista.com>
diff --git a/arch/ppc/syslib/gen550.h b/arch/ppc/syslib/gen550.h
index 039d249e19a8..5254d3cdbca6 100644
--- a/arch/ppc/syslib/gen550.h
+++ b/arch/ppc/syslib/gen550.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/gen550.h
- *
  * gen550 prototypes
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/syslib/gen550_dbg.c b/arch/ppc/syslib/gen550_dbg.c
index 9ef0113c83d1..9fcff74bfdd0 100644
--- a/arch/ppc/syslib/gen550_dbg.c
+++ b/arch/ppc/syslib/gen550_dbg.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/gen550_dbg.c
- *
  * A library of polled 16550 serial routines.  These are intended to
  * be used to support progress messages, xmon, kgdb, etc. on a
  * variety of platforms.
diff --git a/arch/ppc/syslib/gen550_kgdb.c b/arch/ppc/syslib/gen550_kgdb.c
index 7239d5d7ddcd..874078a7664d 100644
--- a/arch/ppc/syslib/gen550_kgdb.c
+++ b/arch/ppc/syslib/gen550_kgdb.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/gen550_kgdb.c
- *
  * Generic 16550 kgdb support intended to be useful on a variety
  * of platforms.  To enable this support, it is necessary to set
  * the CONFIG_GEN550 option.  Any virtual mapping of the serial
diff --git a/arch/ppc/syslib/gt64260_pic.c b/arch/ppc/syslib/gt64260_pic.c
index f97b3a9abd1e..dc3bd9ecbbf6 100644
--- a/arch/ppc/syslib/gt64260_pic.c
+++ b/arch/ppc/syslib/gt64260_pic.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/gt64260_pic.c
- *
  * Interrupt controller support for Galileo's GT64260.
  *
  * Author: Chris Zankel <source@mvista.com>
diff --git a/arch/ppc/syslib/harrier.c b/arch/ppc/syslib/harrier.c
index a6b3f8645793..c1583f488325 100644
--- a/arch/ppc/syslib/harrier.c
+++ b/arch/ppc/syslib/harrier.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/harrier.c
- *
  * Motorola MCG Harrier northbridge/memory controller support
  *
  * Author: Dale Farnsworth
diff --git a/arch/ppc/syslib/hawk_common.c b/arch/ppc/syslib/hawk_common.c
index a9911dc3a82f..c5bf16b0d6a1 100644
--- a/arch/ppc/syslib/hawk_common.c
+++ b/arch/ppc/syslib/hawk_common.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/hawk_common.c
- *
  * Common Motorola PowerPlus Platform--really Falcon/Raven or HAWK.
  *
  * Author: Mark A. Greer
diff --git a/arch/ppc/syslib/ibm440gp_common.c b/arch/ppc/syslib/ibm440gp_common.c
index 0d6be2d6dd67..fbaae5f6d834 100644
--- a/arch/ppc/syslib/ibm440gp_common.c
+++ b/arch/ppc/syslib/ibm440gp_common.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ibm440gp_common.c
- *
  * PPC440GP system library
  *
  * Matt Porter <mporter@mvista.com>
diff --git a/arch/ppc/syslib/ibm440gp_common.h b/arch/ppc/syslib/ibm440gp_common.h
index a054d83cb1ac..f48529f3c23d 100644
--- a/arch/ppc/syslib/ibm440gp_common.h
+++ b/arch/ppc/syslib/ibm440gp_common.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/ibm440gp_common.h
- *
  * PPC440GP system library
  *
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
diff --git a/arch/ppc/syslib/ibm440gx_common.c b/arch/ppc/syslib/ibm440gx_common.c
index c36db279b43d..a7dd55f1c63e 100644
--- a/arch/ppc/syslib/ibm440gx_common.c
+++ b/arch/ppc/syslib/ibm440gx_common.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/ibm440gx_common.c
- *
  * PPC440GX system library
  *
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
diff --git a/arch/ppc/syslib/ibm440gx_common.h b/arch/ppc/syslib/ibm440gx_common.h
index e73aa0411d35..a2ab9fab8e34 100644
--- a/arch/ppc/syslib/ibm440gx_common.h
+++ b/arch/ppc/syslib/ibm440gx_common.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/ibm440gx_common.h
- *
  * PPC440GX system library
  *
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
diff --git a/arch/ppc/syslib/ibm440sp_common.c b/arch/ppc/syslib/ibm440sp_common.c
index cdafda127d81..293e4138d172 100644
--- a/arch/ppc/syslib/ibm440sp_common.c
+++ b/arch/ppc/syslib/ibm440sp_common.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ibm440sp_common.c
- *
  * PPC440SP/PPC440SPe system library
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/syslib/ibm440sp_common.h b/arch/ppc/syslib/ibm440sp_common.h
index a21a9906dcc9..8077bf8ed118 100644
--- a/arch/ppc/syslib/ibm440sp_common.h
+++ b/arch/ppc/syslib/ibm440sp_common.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ibm440sp_common.h
- *
  * PPC440SP system library
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/syslib/ibm44x_common.c b/arch/ppc/syslib/ibm44x_common.c
index 71db11d22158..14a981a5cea7 100644
--- a/arch/ppc/syslib/ibm44x_common.c
+++ b/arch/ppc/syslib/ibm44x_common.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ibm44x_common.c
- *
  * PPC44x system library
  *
  * Matt Porter <mporter@kernel.crashing.org>
diff --git a/arch/ppc/syslib/ibm44x_common.h b/arch/ppc/syslib/ibm44x_common.h
index b25a8995e4e9..f179db8634e0 100644
--- a/arch/ppc/syslib/ibm44x_common.h
+++ b/arch/ppc/syslib/ibm44x_common.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/ibm44x_common.h
- *
  * PPC44x system library
  *
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
diff --git a/arch/ppc/syslib/m8260_pci_erratum9.c b/arch/ppc/syslib/m8260_pci_erratum9.c
index 1dc7e4e1d491..99e4bc0e42af 100644
--- a/arch/ppc/syslib/m8260_pci_erratum9.c
+++ b/arch/ppc/syslib/m8260_pci_erratum9.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/mpc8260_pci9.c
- *
  * Workaround for device erratum PCI 9.
  * See Motorola's "XPC826xA Family Device Errata Reference."
  * The erratum applies to all 8260 family Hip4 processors.  It is scheduled 
diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c
index 76a2aa4ce65e..b7a6cb2d8d52 100644
--- a/arch/ppc/syslib/m8260_setup.c
+++ b/arch/ppc/syslib/m8260_setup.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/syslib/m8260_setup.c
- *
  *  Copyright (C) 1995  Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
  *  Modified by Cort Dougan (cort@cs.nmt.edu)
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c
index 688616de3cde..dae9af78bde1 100644
--- a/arch/ppc/syslib/m8xx_setup.c
+++ b/arch/ppc/syslib/m8xx_setup.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/kernel/setup.c
- *
  *  Copyright (C) 1995  Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
  *  Modified by Cort Dougan (cort@cs.nmt.edu)
@@ -34,6 +32,13 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 
+#if defined(CONFIG_MTD) && defined(CONFIG_MTD_PHYSMAP)
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#endif
+
 #include <asm/mmu.h>
 #include <asm/reg.h>
 #include <asm/residual.h>
@@ -49,6 +54,34 @@
 
 #include "ppc8xx_pic.h"
 
+#ifdef CONFIG_MTD_PHYSMAP
+#define MPC8xxADS_BANK_WIDTH 4
+#endif
+
+#define MPC8xxADS_U_BOOT_SIZE          0x80000
+#define MPC8xxADS_FREE_AREA_OFFSET     MPC8xxADS_U_BOOT_SIZE
+
+#if defined(CONFIG_MTD_PARTITIONS)
+ /*
+   NOTE: bank width and interleave relative to the installed flash
+   should have been chosen within MTD_CFI_GEOMETRY options.
+ */
+static struct mtd_partition mpc8xxads_partitions[] = {
+        {
+                .name = "bootloader",
+                .size = MPC8xxADS_U_BOOT_SIZE,
+                .offset = 0,
+                .mask_flags   = MTD_WRITEABLE,  /* force read-only */
+        }, {
+                .name = "User FS",
+                .offset = MPC8xxADS_FREE_AREA_OFFSET
+        }
+};
+
+#define mpc8xxads_part_num (sizeof (mpc8xxads_partitions) / sizeof (mpc8xxads_partitions[0]))
+
+#endif
+
 static int m8xx_set_rtc_time(unsigned long time);
 static unsigned long m8xx_get_rtc_time(void);
 void m8xx_calibrate_decr(void);
@@ -71,6 +104,10 @@ board_init(void)
 void __init
 m8xx_setup_arch(void)
 {
+#if defined(CONFIG_MTD) && defined(CONFIG_MTD_PHYSMAP)
+        bd_t *binfo = (bd_t *)__res;
+#endif
+
         /* Reset the Communication Processor Module.
         */
         m8xx_cpm_reset();
@@ -106,6 +143,17 @@ m8xx_setup_arch(void)
         }
 #endif
 #endif
+
+#if defined (CONFIG_MPC86XADS) || defined (CONFIG_MPC885ADS)
+#if defined(CONFIG_MTD_PHYSMAP)
+       physmap_configure(binfo->bi_flashstart, binfo->bi_flashsize,
+                                               MPC8xxADS_BANK_WIDTH, NULL);
+#ifdef CONFIG_MTD_PARTITIONS
+       physmap_set_partitions(mpc8xxads_partitions, mpc8xxads_part_num);
+#endif /* CONFIG_MTD_PARTITIONS */
+#endif /* CONFIG_MTD_PHYSMAP */
+#endif
+
         board_init();
 }
 
@@ -140,9 +188,11 @@ void __init __attribute__ ((weak))
 init_internal_rtc(void)
 {
         /* Disable the RTC one second and alarm interrupts. */
-        out_be16(&((immap_t *)IMAP_ADDR)->im_sit.sit_rtcsc, in_be16(&((immap_t *)IMAP_ADDR)->im_sit.sit_rtcsc) & ~(RTCSC_SIE | RTCSC_ALE));
+        clrbits16(&((immap_t *)IMAP_ADDR)->im_sit.sit_rtcsc, (RTCSC_SIE | RTCSC_ALE));
+
         /* Enable the RTC */
-        out_be16(&((immap_t *)IMAP_ADDR)->im_sit.sit_rtcsc, in_be16(&((immap_t *)IMAP_ADDR)->im_sit.sit_rtcsc) | (RTCSC_RTF | RTCSC_RTE));
+        setbits16(&((immap_t *)IMAP_ADDR)->im_sit.sit_rtcsc, (RTCSC_RTF | RTCSC_RTE));
+
 }
 
 /* The decrementer counts at the system (internal) clock frequency divided by
@@ -159,8 +209,7 @@ void __init m8xx_calibrate_decr(void)
         out_be32(&((immap_t *)IMAP_ADDR)->im_clkrstk.cark_sccrk, KAPWR_KEY);
 
         /* Force all 8xx processors to use divide by 16 processor clock. */
-        out_be32(&((immap_t *)IMAP_ADDR)->im_clkrst.car_sccr,
-                in_be32(&((immap_t *)IMAP_ADDR)->im_clkrst.car_sccr)|0x02000000);
+        setbits32(&((immap_t *)IMAP_ADDR)->im_clkrst.car_sccr, 0x02000000);
         /* Processor frequency is MHz.
          * The value 'fp' is the number of decrementer ticks per second.
          */
@@ -239,8 +288,8 @@ m8xx_restart(char *cmd)
         __volatile__ unsigned char dummy;
 
         local_irq_disable();
-        out_be32(&((immap_t *)IMAP_ADDR)->im_clkrst.car_plprcr, in_be32(&((immap_t *)IMAP_ADDR)->im_clkrst.car_plprcr) | 0x00000080);
 
+        setbits32(&((immap_t *)IMAP_ADDR)->im_clkrst.car_plprcr, 0x00000080);
         /* Clear the ME bit in MSR to cause checkstop on machine check
         */
         mtmsr(mfmsr() & ~0x1000);
@@ -310,8 +359,8 @@ m8xx_init_IRQ(void)
         i8259_init(0);
 
         /* The i8259 cascade interrupt must be level sensitive. */
-        out_be32(&((immap_t *)IMAP_ADDR)->im_siu_conf.sc_siel, in_be32(&((immap_t *)IMAP_ADDR)->im_siu_conf.sc_siel & ~(0x80000000 >> ISA_BRIDGE_INT)));
 
+        clrbits32(&((immap_t *)IMAP_ADDR)->im_siu_conf.sc_siel, (0x80000000 >> ISA_BRIDGE_INT));
         if (setup_irq(ISA_BRIDGE_INT, &mbx_i8259_irqaction))
                 enable_irq(ISA_BRIDGE_INT);
 #endif  /* CONFIG_PCI */
diff --git a/arch/ppc/syslib/m8xx_wdt.c b/arch/ppc/syslib/m8xx_wdt.c
index df6c9557b86a..ac11d7bab443 100644
--- a/arch/ppc/syslib/m8xx_wdt.c
+++ b/arch/ppc/syslib/m8xx_wdt.c
@@ -41,8 +41,7 @@ static irqreturn_t m8xx_wdt_interrupt(int irq, void *dev, struct pt_regs *regs)
 
         m8xx_wdt_reset();
 
-        out_be16(&imap->im_sit.sit_piscr, in_be16(&imap->im_sit.sit_piscr) | PISCR_PS); /* clear irq */
-
+        setbits16(&imap->im_sit.sit_piscr, PISCR_PS);
         return IRQ_HANDLED;
 }
 
diff --git a/arch/ppc/syslib/mpc10x_common.c b/arch/ppc/syslib/mpc10x_common.c
index 3e039706bdbc..2fc7c4150a18 100644
--- a/arch/ppc/syslib/mpc10x_common.c
+++ b/arch/ppc/syslib/mpc10x_common.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mpc10x_common.c
- *
  * Common routines for the Motorola SPS MPC106, MPC107 and MPC8240 Host bridge,
  * Mem ctlr, EPIC, etc.
  *
diff --git a/arch/ppc/syslib/mpc52xx_devices.c b/arch/ppc/syslib/mpc52xx_devices.c
index da3c74bfdc92..7487539a4e92 100644
--- a/arch/ppc/syslib/mpc52xx_devices.c
+++ b/arch/ppc/syslib/mpc52xx_devices.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mpc52xx_devices.c
- *
  * Freescale MPC52xx device descriptions
  *
  *
diff --git a/arch/ppc/syslib/mpc52xx_pci.c b/arch/ppc/syslib/mpc52xx_pci.c
index 313c96ec7eb1..5a5a7a9cd248 100644
--- a/arch/ppc/syslib/mpc52xx_pci.c
+++ b/arch/ppc/syslib/mpc52xx_pci.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mpc52xx_pci.c
- *
  * PCI code for the Freescale MPC52xx embedded CPU.
  *
  *
@@ -227,7 +225,8 @@ mpc52xx_pci_fixup_resources(struct pci_dev *dev)
         /* The PCI Host bridge of MPC52xx has a prefetch memory resource
            fixed to 1Gb. Doesn't fit in the resource system so we remove it */
         if ( (dev->vendor == PCI_VENDOR_ID_MOTOROLA) &&
-             (dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200) ) {
+             (   dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200
+              || dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200B) ) {
                 struct resource *res = &dev->resource[1];
                 res->start = res->end = res->flags = 0;
         }
diff --git a/arch/ppc/syslib/mpc52xx_pci.h b/arch/ppc/syslib/mpc52xx_pci.h
index 04b509a02530..77d47dbba85e 100644
--- a/arch/ppc/syslib/mpc52xx_pci.h
+++ b/arch/ppc/syslib/mpc52xx_pci.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mpc52xx_pci.h
- *
  * PCI Include file the Freescale MPC52xx embedded cpu chips
  *
  *
diff --git a/arch/ppc/syslib/mpc52xx_pic.c b/arch/ppc/syslib/mpc52xx_pic.c
index 4c4497e62517..c4406f9dc6a3 100644
--- a/arch/ppc/syslib/mpc52xx_pic.c
+++ b/arch/ppc/syslib/mpc52xx_pic.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mpc52xx_pic.c
- *
  * Programmable Interrupt Controller functions for the Freescale MPC52xx 
  * embedded CPU.
  *
diff --git a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c
index a4a4b02227df..ee6379bb415e 100644
--- a/arch/ppc/syslib/mpc52xx_setup.c
+++ b/arch/ppc/syslib/mpc52xx_setup.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mpc52xx_setup.c
- *
  * Common code for the boards based on Freescale MPC52xx embedded CPU.
  *
  * 
@@ -26,6 +24,8 @@
 #include <asm/pgtable.h>
 #include <asm/ppcboot.h>
 
+#include <syslib/mpc52xx_pci.h>
+
 extern bd_t __res;
 
 static int core_mult[] = {              /* CPU Frequency multiplier, taken    */
@@ -218,6 +218,52 @@ mpc52xx_calibrate_decr(void)
         tb_to_us = mulhwu_scale_factor(xlbfreq / divisor, 1000000);
 }
 
+
+void __init
+mpc52xx_setup_cpu(void)
+{
+        struct mpc52xx_cdm  __iomem *cdm;
+        struct mpc52xx_xlb  __iomem *xlb;
+
+        /* Map zones */
+        cdm  = ioremap(MPC52xx_PA(MPC52xx_CDM_OFFSET), MPC52xx_CDM_SIZE);
+        xlb  = ioremap(MPC52xx_PA(MPC52xx_XLB_OFFSET), MPC52xx_XLB_SIZE);
+
+        if (!cdm || !xlb) {
+                printk(KERN_ERR __FILE__ ": "
+                        "Error while mapping CDM/XLB during "
+                        "mpc52xx_setup_cpu\n");
+                goto unmap_regs;
+        }
+
+        /* Use internal 48 Mhz */
+        out_8(&cdm->ext_48mhz_en, 0x00);
+        out_8(&cdm->fd_enable, 0x01);
+        if (in_be32(&cdm->rstcfg) & 0x40)       /* Assumes 33Mhz clock */
+                out_be16(&cdm->fd_counters, 0x0001);
+        else
+                out_be16(&cdm->fd_counters, 0x5555);
+
+        /* Configure the XLB Arbiter priorities */
+        out_be32(&xlb->master_pri_enable, 0xff);
+        out_be32(&xlb->master_priority, 0x11111111);
+
+        /* Enable ram snooping for 1GB window */
+        out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_SNOOP);
+        out_be32(&xlb->snoop_window, MPC52xx_PCI_TARGET_MEM | 0x1d);
+
+        /* Disable XLB pipelining */
+        /* (cfr errate 292. We could do this only just before ATA PIO
+            transaction and re-enable it after ...) */
+        out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS);
+
+        /* Unmap reg zone */
+unmap_regs:
+        if (cdm)  iounmap(cdm);
+        if (xlb)  iounmap(xlb);
+}
+
+
 int mpc52xx_match_psc_function(int psc_idx, const char *func)
 {
         struct mpc52xx_psc_func *cf = mpc52xx_psc_functions;
diff --git a/arch/ppc/syslib/mpc52xx_sys.c b/arch/ppc/syslib/mpc52xx_sys.c
index 9a0f90aa8aac..b4e6f978f057 100644
--- a/arch/ppc/syslib/mpc52xx_sys.c
+++ b/arch/ppc/syslib/mpc52xx_sys.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mpc52xx_sys.c
- *
  * Freescale MPC52xx system descriptions
  *
  *
diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c
index f9b95de70e23..1af2c000fcfa 100644
--- a/arch/ppc/syslib/mpc83xx_devices.c
+++ b/arch/ppc/syslib/mpc83xx_devices.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/83xx/mpc83xx_devices.c
- *
  * MPC83xx Device descriptions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/mpc83xx_sys.c b/arch/ppc/syslib/mpc83xx_sys.c
index 82cf3ab77f4a..0498ae7e01e3 100644
--- a/arch/ppc/syslib/mpc83xx_sys.c
+++ b/arch/ppc/syslib/mpc83xx_sys.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/83xx/mpc83xx_sys.c
- *
  * MPC83xx System descriptions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/mpc85xx_devices.c b/arch/ppc/syslib/mpc85xx_devices.c
index 00e9b6ff2f6e..7735336f5b8f 100644
--- a/arch/ppc/syslib/mpc85xx_devices.c
+++ b/arch/ppc/syslib/mpc85xx_devices.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/mpc85xx_devices.c
- *
  * MPC85xx Device descriptions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/mpc85xx_sys.c b/arch/ppc/syslib/mpc85xx_sys.c
index 397cfbcce5ea..d96a93dbcb5a 100644
--- a/arch/ppc/syslib/mpc85xx_sys.c
+++ b/arch/ppc/syslib/mpc85xx_sys.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/85xx/mpc85xx_sys.c
- *
  * MPC85xx System descriptions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/mpc8xx_devices.c b/arch/ppc/syslib/mpc8xx_devices.c
index 92dc98b36bde..bd41ed83beb3 100644
--- a/arch/ppc/syslib/mpc8xx_devices.c
+++ b/arch/ppc/syslib/mpc8xx_devices.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mpc8xx_devices.c
- *
  * MPC8xx Device descriptions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/mpc8xx_sys.c b/arch/ppc/syslib/mpc8xx_sys.c
index d3c617521603..eee213284855 100644
--- a/arch/ppc/syslib/mpc8xx_sys.c
+++ b/arch/ppc/syslib/mpc8xx_sys.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/mpc8xx_sys.c
- *
  * MPC8xx System descriptions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/mv64360_pic.c b/arch/ppc/syslib/mv64360_pic.c
index 58b0aa813e85..5a19697060f0 100644
--- a/arch/ppc/syslib/mv64360_pic.c
+++ b/arch/ppc/syslib/mv64360_pic.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/mv64360_pic.c
- *
  * Interrupt controller support for Marvell's MV64360.
  *
  * Author: Rabeeh Khoury <rabeeh@galileo.co.il>
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 1f01b7e2376b..3b039c30a439 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mv64x60.c
- *
  * Common routines for the Marvell/Galileo Discovery line of host bridges
  * (gt64260, mv64360, mv64460, ...).
  *
diff --git a/arch/ppc/syslib/mv64x60_dbg.c b/arch/ppc/syslib/mv64x60_dbg.c
index fa5b2e45e0ca..9cf18764a1a1 100644
--- a/arch/ppc/syslib/mv64x60_dbg.c
+++ b/arch/ppc/syslib/mv64x60_dbg.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mv64x60_dbg.c
- *
  * KGDB and progress routines for the Marvell/Galileo MV64x60 (Discovery).
  *
  * Author: Mark A. Greer <mgreer@mvista.com>
diff --git a/arch/ppc/syslib/mv64x60_win.c b/arch/ppc/syslib/mv64x60_win.c
index 5b827e2bbe22..4bf1ad17bf1a 100644
--- a/arch/ppc/syslib/mv64x60_win.c
+++ b/arch/ppc/syslib/mv64x60_win.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/mv64x60_win.c
- *
  * Tables with info on how to manipulate the 32 & 64 bit windows on the
  * various types of Marvell bridge chips.
  *
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c
index 2fe28ded2c60..a4ecc2ee579f 100644
--- a/arch/ppc/syslib/ocp.c
+++ b/arch/ppc/syslib/ocp.c
@@ -451,10 +451,9 @@ ocp_driver_init(void)
         DBG(("ocp: ocp_driver_init()...\n"));
 
         /* Allocate/register primary OCP bus */
-        ocp_bus = kmalloc(sizeof(struct device), GFP_KERNEL);
+        ocp_bus = kzalloc(sizeof(struct device), GFP_KERNEL);
         if (ocp_bus == NULL)
                 return 1;
-        memset(ocp_bus, 0, sizeof(struct device));
         strcpy(ocp_bus->bus_id, "ocp");
 
         bus_register(&ocp_bus_type);
diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c
index 894779712b46..70456c8f998c 100644
--- a/arch/ppc/syslib/open_pic.c
+++ b/arch/ppc/syslib/open_pic.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/kernel/open_pic.c -- OpenPIC Interrupt Handling
- *
  *  Copyright (C) 1997 Geert Uytterhoeven
  *
  *  This file is subject to the terms and conditions of the GNU General Public
@@ -218,7 +216,7 @@ static void openpic_safe_writefield(volatile u_int __iomem *addr, u_int mask,
 u_int openpic_read_IPI(volatile u_int __iomem * addr)
 {
          u_int val = 0;
-#if defined(OPENPIC_BIG_ENDIAN) || defined(CONFIG_POWER3)
+#if defined(OPENPIC_BIG_ENDIAN)
         val = in_be32(addr);
 #else
         val = in_le32(addr);
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c
index 1c40049b9a45..bcbe40de26fe 100644
--- a/arch/ppc/syslib/open_pic2.c
+++ b/arch/ppc/syslib/open_pic2.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/kernel/open_pic.c -- OpenPIC Interrupt Handling
- *
  *  Copyright (C) 1997 Geert Uytterhoeven
  *
  *  This file is subject to the terms and conditions of the GNU General Public
diff --git a/arch/ppc/syslib/open_pic_defs.h b/arch/ppc/syslib/open_pic_defs.h
index 6c94e7131463..3a25de7cb572 100644
--- a/arch/ppc/syslib/open_pic_defs.h
+++ b/arch/ppc/syslib/open_pic_defs.h
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/kernel/open_pic_defs.h -- OpenPIC definitions
- *
  *  Copyright (C) 1997 Geert Uytterhoeven
  *
  *  This file is based on the following documentation:
diff --git a/arch/ppc/syslib/pci_auto.c b/arch/ppc/syslib/pci_auto.c
index d64207c2a972..ee20a86fcc4b 100644
--- a/arch/ppc/syslib/pci_auto.c
+++ b/arch/ppc/syslib/pci_auto.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/pci_auto.c
- *
  * PCI autoconfiguration library
  *
  * Author: Matt Porter <mporter@mvista.com>
diff --git a/arch/ppc/syslib/ppc4xx_dma.c b/arch/ppc/syslib/ppc4xx_dma.c
index 05ccd598dd4e..b40b96a8c609 100644
--- a/arch/ppc/syslib/ppc4xx_dma.c
+++ b/arch/ppc/syslib/ppc4xx_dma.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/ppc4xx_dma.c
- *
  * IBM PPC4xx DMA engine core library
  *
  * Copyright 2000-2004 MontaVista Software Inc.
diff --git a/arch/ppc/syslib/ppc4xx_pic.c b/arch/ppc/syslib/ppc4xx_pic.c
index aa4165144ec2..fd9af0fc0e9f 100644
--- a/arch/ppc/syslib/ppc4xx_pic.c
+++ b/arch/ppc/syslib/ppc4xx_pic.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ppc4xx_pic.c
- *
  * Interrupt controller driver for PowerPC 4xx-based processors.
  *
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
diff --git a/arch/ppc/syslib/ppc4xx_pm.c b/arch/ppc/syslib/ppc4xx_pm.c
deleted file mode 100644
index 60a479204885..000000000000
--- a/arch/ppc/syslib/ppc4xx_pm.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Author: Armin Kuster <akuster@mvista.com>
- *
- * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * This an attempt to get Power Management going for the IBM 4xx processor.
- * This was derived from the ppc4xx._setup.c file
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-
-#include <asm/ibm4xx.h>
-
-void __init
-ppc4xx_pm_init(void)
-{
-
-        unsigned int value = 0;
-
-        /* turn off unused hardware to save power */
-#ifdef CONFIG_405GP
-        value |= CPM_DCP;       /* CodePack */
-#endif
-
-#if !defined(CONFIG_IBM_OCP_GPIO)
-        value |= CPM_GPIO0;
-#endif
-
-#if !defined(CONFIG_PPC405_I2C_ADAP)
-        value |= CPM_IIC0;
-#ifdef CONFIG_STB03xxx
-        value |= CPM_IIC1;
-#endif
-#endif
-
-
-#if !defined(CONFIG_405_DMA)
-        value |= CPM_DMA;
-#endif
-
-        mtdcr(DCRN_CPMFR, value);
-
-}
diff --git a/arch/ppc/syslib/ppc4xx_sgdma.c b/arch/ppc/syslib/ppc4xx_sgdma.c
index 9f76e8ee39ed..280ea010a9c8 100644
--- a/arch/ppc/syslib/ppc4xx_sgdma.c
+++ b/arch/ppc/syslib/ppc4xx_sgdma.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/ppc4xx_sgdma.c
- *
  * IBM PPC4xx DMA engine scatter/gather library
  *
  * Copyright 2002-2003 MontaVista Software Inc.
diff --git a/arch/ppc/syslib/ppc83xx_setup.c b/arch/ppc/syslib/ppc83xx_setup.c
index 7bada82527a8..26afd637dc81 100644
--- a/arch/ppc/syslib/ppc83xx_setup.c
+++ b/arch/ppc/syslib/ppc83xx_setup.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ppc83xx_setup.c
- *
  * MPC83XX common board code
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/ppc83xx_setup.h b/arch/ppc/syslib/ppc83xx_setup.h
index a122a7322e5e..478b011cd963 100644
--- a/arch/ppc/syslib/ppc83xx_setup.h
+++ b/arch/ppc/syslib/ppc83xx_setup.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ppc83xx_setup.h
- *
  * MPC83XX common board definitions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/ppc85xx_common.c b/arch/ppc/syslib/ppc85xx_common.c
index 19ad537225e4..0145c968f9ad 100644
--- a/arch/ppc/syslib/ppc85xx_common.c
+++ b/arch/ppc/syslib/ppc85xx_common.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ppc85xx_common.c
- *
  * MPC85xx support routines
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/ppc85xx_common.h b/arch/ppc/syslib/ppc85xx_common.h
index 94edf32151dd..182744a1321c 100644
--- a/arch/ppc/syslib/ppc85xx_common.h
+++ b/arch/ppc/syslib/ppc85xx_common.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ppc85xx_common.h
- *
  * MPC85xx support routines
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c
index e4dda43fdaa7..79b7089d7500 100644
--- a/arch/ppc/syslib/ppc85xx_setup.c
+++ b/arch/ppc/syslib/ppc85xx_setup.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ppc85xx_setup.c
- *
  * MPC85XX common board code
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
@@ -237,7 +235,7 @@ mpc85xx_setup_pci2(struct pci_controller *hose)
            (__ilog2(MPC85XX_PCI2_UPPER_MEM - MPC85XX_PCI2_LOWER_MEM + 1) - 1);
 
         /* Setup outbound IO windows @ MPC85XX_PCI2_IO_BASE */
-        pci->potar2 = (MPC85XX_PCI2_LOWER_IO >> 12) & 0x000fffff;;
+        pci->potar2 = (MPC85XX_PCI2_LOWER_IO >> 12) & 0x000fffff;
         pci->potear2 = 0x00000000;
         pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff;
         /* Enable, IO R/W */
diff --git a/arch/ppc/syslib/ppc85xx_setup.h b/arch/ppc/syslib/ppc85xx_setup.h
index e340b0545fb5..f55b8032d3d9 100644
--- a/arch/ppc/syslib/ppc85xx_setup.h
+++ b/arch/ppc/syslib/ppc85xx_setup.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ppc85xx_setup.h
- *
  * MPC85XX common board definitions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/ppc_sys.c b/arch/ppc/syslib/ppc_sys.c
index c0b93c4191ee..60c724e11584 100644
--- a/arch/ppc/syslib/ppc_sys.c
+++ b/arch/ppc/syslib/ppc_sys.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/ppc_sys.c
- *
  * PPC System library functions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
@@ -15,11 +13,22 @@
  */
 
 #include <linux/string.h>
+#include <linux/bootmem.h>
 #include <asm/ppc_sys.h>
 
 int (*ppc_sys_device_fixup) (struct platform_device * pdev);
 
 static int ppc_sys_inited;
+static int ppc_sys_func_inited;
+
+static const char *ppc_sys_func_names[] = {
+        [PPC_SYS_FUNC_DUMMY] = "dummy",
+        [PPC_SYS_FUNC_ETH] = "eth",
+        [PPC_SYS_FUNC_UART] = "uart",
+        [PPC_SYS_FUNC_HLDC] = "hldc",
+        [PPC_SYS_FUNC_USB] = "usb",
+        [PPC_SYS_FUNC_IRDA] = "irda",
+};
 
 void __init identify_ppc_sys_by_id(u32 id)
 {
@@ -38,13 +47,13 @@ void __init identify_ppc_sys_by_id(u32 id)
 void __init identify_ppc_sys_by_name(char *name)
 {
         unsigned int i = 0;
-        while (ppc_sys_specs[i].ppc_sys_name[0])
-        {
+        while (ppc_sys_specs[i].ppc_sys_name[0]) {
                 if (!strcmp(ppc_sys_specs[i].ppc_sys_name, name))
                         break;
                 i++;
         }
         cur_ppc_sys_spec = &ppc_sys_specs[i];
+
         return;
 }
 
@@ -128,6 +137,165 @@ void ppc_sys_device_remove(enum ppc_sys_devices dev)
         }
 }
 
+/* Platform-notify mapping
+ * Helper function for BSP code to assign board-specific platfom-divice bits
+ */
+
+void platform_notify_map(const struct platform_notify_dev_map *map,
+                         struct device *dev)
+{
+        struct platform_device *pdev;
+        int len, idx;
+        const char *s;
+
+        /* do nothing if no device or no bus_id */
+        if (!dev || !dev->bus_id)
+                return;
+
+        /* call per device map */
+        while (map->bus_id != NULL) {
+                idx = -1;
+                s = strrchr(dev->bus_id, '.');
+                if (s != NULL)
+                        idx = (int)simple_strtol(s + 1, NULL, 10);
+                else
+                        s = dev->bus_id;
+
+                len = s - dev->bus_id;
+
+                if (!strncmp(dev->bus_id, map->bus_id, len)) {
+                        pdev = container_of(dev, struct platform_device, dev);
+                        map->rtn(pdev, idx);
+                }
+                map++;
+        }
+}
+
+/*
+   Function assignment stuff.
+ Intended to work as follows:
+ the device name defined in foo_devices.c will be concatenated with :"func",
+ where func is string map of respective function from platfom_device_func enum
+
+ The PPC_SYS_FUNC_DUMMY function is intended to remove all assignments, making the device to appear
+ in platform bus with unmodified name.
+ */
+
+/*
+   Here we'll replace .name pointers with fixed-lenght strings
+   Hereby, this should be called *before* any func stuff triggeded.
+ */
+void ppc_sys_device_initfunc(void)
+{
+        int i;
+        const char *name;
+        static char new_names[NUM_PPC_SYS_DEVS][BUS_ID_SIZE];
+        enum ppc_sys_devices cur_dev;
+
+        /* If inited yet, do nothing */
+        if (ppc_sys_func_inited)
+                return;
+
+        for (i = 0; i < cur_ppc_sys_spec->num_devices; i++) {
+                if ((cur_dev = cur_ppc_sys_spec->device_list[i]) < 0)
+                        continue;
+
+                if (ppc_sys_platform_devices[cur_dev].name) {
+                        /*backup name */
+                        name = ppc_sys_platform_devices[cur_dev].name;
+                        strlcpy(new_names[i], name, BUS_ID_SIZE);
+                        ppc_sys_platform_devices[cur_dev].name = new_names[i];
+                }
+        }
+
+        ppc_sys_func_inited = 1;
+}
+
+/*The "engine" of the func stuff. Here we either concat specified function string description
+ to the name, or remove it if PPC_SYS_FUNC_DUMMY parameter is passed here*/
+void ppc_sys_device_setfunc(enum ppc_sys_devices dev,
+                            enum platform_device_func func)
+{
+        char *s;
+        char *name = (char *)ppc_sys_platform_devices[dev].name;
+        char tmp[BUS_ID_SIZE];
+
+        if (!ppc_sys_func_inited) {
+                printk(KERN_ERR "Unable to alter function - not inited!\n");
+                return;
+        }
+
+        if (ppc_sys_inited) {
+                platform_device_unregister(&ppc_sys_platform_devices[dev]);
+        }
+
+        if ((s = (char *)strchr(name, ':')) != NULL) {  /* reassign */
+                /* Either change the name after ':' or remove func modifications */
+                if (func != PPC_SYS_FUNC_DUMMY)
+                        strlcpy(s + 1, ppc_sys_func_names[func], BUS_ID_SIZE);
+                else
+                        *s = 0;
+        } else if (func != PPC_SYS_FUNC_DUMMY) {
+                /* do assignment if it is not just "clear"  request */
+                sprintf(tmp, "%s:%s", name, ppc_sys_func_names[func]);
+                strlcpy(name, tmp, BUS_ID_SIZE);
+        }
+
+        if (ppc_sys_inited) {
+                platform_device_register(&ppc_sys_platform_devices[dev]);
+        }
+}
+
+void ppc_sys_device_disable(enum ppc_sys_devices dev)
+{
+        BUG_ON(cur_ppc_sys_spec == NULL);
+
+        /*Check if it is enabled*/
+        if(!(cur_ppc_sys_spec->config[dev] & PPC_SYS_CONFIG_DISABLED)) {
+                if (ppc_sys_inited) {
+                        platform_device_unregister(&ppc_sys_platform_devices[dev]);
+                }
+                cur_ppc_sys_spec->config[dev] |= PPC_SYS_CONFIG_DISABLED;
+        }
+}
+
+void ppc_sys_device_enable(enum ppc_sys_devices dev)
+{
+        BUG_ON(cur_ppc_sys_spec == NULL);
+
+        /*Check if it is disabled*/
+        if(cur_ppc_sys_spec->config[dev] & PPC_SYS_CONFIG_DISABLED) {
+                if (ppc_sys_inited) {
+                        platform_device_register(&ppc_sys_platform_devices[dev]);
+                }
+                cur_ppc_sys_spec->config[dev] &= ~PPC_SYS_CONFIG_DISABLED;
+        }
+
+}
+
+void ppc_sys_device_enable_all(void)
+{
+        enum ppc_sys_devices cur_dev;
+        int i;
+
+        for (i = 0; i < cur_ppc_sys_spec->num_devices; i++) {
+                cur_dev = cur_ppc_sys_spec->device_list[i];
+                ppc_sys_device_enable(cur_dev);
+        }
+}
+
+void ppc_sys_device_disable_all(void)
+{
+        enum ppc_sys_devices cur_dev;
+        int i;
+
+        for (i = 0; i < cur_ppc_sys_spec->num_devices; i++) {
+                cur_dev = cur_ppc_sys_spec->device_list[i];
+                ppc_sys_device_disable(cur_dev);
+        }
+}
+
+
 static int __init ppc_sys_init(void)
 {
         unsigned int i, dev_id, ret = 0;
@@ -136,7 +304,8 @@ static int __init ppc_sys_init(void)
 
         for (i = 0; i < cur_ppc_sys_spec->num_devices; i++) {
                 dev_id = cur_ppc_sys_spec->device_list[i];
-                if (dev_id != -1) {
+                if ((dev_id != -1) &&
+                !(cur_ppc_sys_spec->config[dev_id] & PPC_SYS_CONFIG_DISABLED)) {
                         if (ppc_sys_device_fixup != NULL)
                                 ppc_sys_device_fixup(&ppc_sys_platform_devices
                                                      [dev_id]);
diff --git a/arch/ppc/syslib/pq2_devices.c b/arch/ppc/syslib/pq2_devices.c
index 6ff3aab82fc3..0636aed7b827 100644
--- a/arch/ppc/syslib/pq2_devices.c
+++ b/arch/ppc/syslib/pq2_devices.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/pq2_devices.c
- *
  * PQ2 Device descriptions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/pq2_sys.c b/arch/ppc/syslib/pq2_sys.c
index 36d6e2179940..75e64f1c144d 100644
--- a/arch/ppc/syslib/pq2_sys.c
+++ b/arch/ppc/syslib/pq2_sys.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/pq2_devices.c
- *
  * PQ2 System descriptions
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
diff --git a/arch/ppc/syslib/prep_nvram.c b/arch/ppc/syslib/prep_nvram.c
index 2c6364d9641f..474dccbc4a8a 100644
--- a/arch/ppc/syslib/prep_nvram.c
+++ b/arch/ppc/syslib/prep_nvram.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/prep_nvram.c
- *
  * Copyright (C) 1998  Corey Minyard
  *
  * This reads the NvRAM on PReP compliant machines (generally from IBM or
diff --git a/arch/ppc/syslib/prom.c b/arch/ppc/syslib/prom.c
deleted file mode 100644
index 482f837fd373..000000000000
--- a/arch/ppc/syslib/prom.c
+++ /dev/null
@@ -1,1429 +0,0 @@
-/*
- * Procedures for interfacing to the Open Firmware PROM on
- * Power Macintosh computers.
- *
- * In particular, we are interested in the device tree
- * and in using some of its services (exit, write to stdout).
- *
- * Paul Mackerras       August 1996.
- * Copyright (C) 1996 Paul Mackerras.
- */
-#include <stdarg.h>
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/threads.h>
-#include <linux/spinlock.h>
-#include <linux/ioport.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/bitops.h>
-
-#include <asm/sections.h>
-#include <asm/prom.h>
-#include <asm/page.h>
-#include <asm/processor.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/smp.h>
-#include <asm/bootx.h>
-#include <asm/system.h>
-#include <asm/mmu.h>
-#include <asm/pgtable.h>
-#include <asm/bootinfo.h>
-#include <asm/btext.h>
-#include <asm/pci-bridge.h>
-#include <asm/open_pic.h>
-
-
-struct pci_address {
-        unsigned a_hi;
-        unsigned a_mid;
-        unsigned a_lo;
-};
-
-struct pci_reg_property {
-        struct pci_address addr;
-        unsigned size_hi;
-        unsigned size_lo;
-};
-
-struct isa_reg_property {
-        unsigned space;
-        unsigned address;
-        unsigned size;
-};
-
-typedef unsigned long interpret_func(struct device_node *, unsigned long,
-                                     int, int);
-static interpret_func interpret_pci_props;
-static interpret_func interpret_dbdma_props;
-static interpret_func interpret_isa_props;
-static interpret_func interpret_macio_props;
-static interpret_func interpret_root_props;
-
-extern char *klimit;
-
-/* Set for a newworld or CHRP machine */
-int use_of_interrupt_tree;
-struct device_node *dflt_interrupt_controller;
-int num_interrupt_controllers;
-
-extern unsigned int rtas_entry;  /* physical pointer */
-
-extern struct device_node *allnodes;
-
-static unsigned long finish_node(struct device_node *, unsigned long,
-                                 interpret_func *, int, int);
-static unsigned long finish_node_interrupts(struct device_node *, unsigned long);
-static struct device_node *find_phandle(phandle);
-
-extern void enter_rtas(void *);
-void phys_call_rtas(int, int, int, ...);
-
-extern char cmd_line[512];      /* XXX */
-extern boot_infos_t *boot_infos;
-unsigned long dev_tree_size;
-
-void
-phys_call_rtas(int service, int nargs, int nret, ...)
-{
-        va_list list;
-        union {
-                unsigned long words[16];
-                double align;
-        } u;
-        void (*rtas)(void *, unsigned long);
-        int i;
-
-        u.words[0] = service;
-        u.words[1] = nargs;
-        u.words[2] = nret;
-        va_start(list, nret);
-        for (i = 0; i < nargs; ++i)
-                u.words[i+3] = va_arg(list, unsigned long);
-        va_end(list);
-
-        rtas = (void (*)(void *, unsigned long)) rtas_entry;
-        rtas(&u, rtas_data);
-}
-
-/*
- * finish_device_tree is called once things are running normally
- * (i.e. with text and data mapped to the address they were linked at).
- * It traverses the device tree and fills in the name, type,
- * {n_}addrs and {n_}intrs fields of each node.
- */
-void __init
-finish_device_tree(void)
-{
-        unsigned long mem = (unsigned long) klimit;
-        struct device_node *np;
-
-        /* All CHRPs now use the interrupt tree */
-        for (np = allnodes; np != NULL; np = np->allnext) {
-                if (get_property(np, "interrupt-parent", NULL)) {
-                        use_of_interrupt_tree = 1;
-                        break;
-                }
-        }
-
-        if (use_of_interrupt_tree) {
-                /*
-                 * We want to find out here how many interrupt-controller
-                 * nodes there are, and if we are booted from BootX,
-                 * we need a pointer to the first (and hopefully only)
-                 * such node.  But we can't use find_devices here since
-                 * np->name has not been set yet.  -- paulus
-                 */
-                int n = 0;
-                char *name, *ic;
-                int iclen;
-
-                for (np = allnodes; np != NULL; np = np->allnext) {
-                        ic = get_property(np, "interrupt-controller", &iclen);
-                        name = get_property(np, "name", NULL);
-                        /* checking iclen makes sure we don't get a false
-                           match on /chosen.interrupt_controller */
-                        if ((name != NULL
-                             && strcmp(name, "interrupt-controller") == 0)
-                            || (ic != NULL && iclen == 0 && strcmp(name, "AppleKiwi"))) {
-                                if (n == 0)
-                                        dflt_interrupt_controller = np;
-                                ++n;
-                        }
-                }
-                num_interrupt_controllers = n;
-        }
-
-        mem = finish_node(allnodes, mem, NULL, 1, 1);
-        dev_tree_size = mem - (unsigned long) allnodes;
-        klimit = (char *) mem;
-}
-
-static unsigned long __init
-finish_node(struct device_node *np, unsigned long mem_start,
-            interpret_func *ifunc, int naddrc, int nsizec)
-{
-        struct device_node *child;
-        int *ip;
-
-        np->name = get_property(np, "name", NULL);
-        np->type = get_property(np, "device_type", NULL);
-
-        if (!np->name)
-                np->name = "<NULL>";
-        if (!np->type)
-                np->type = "<NULL>";
-
-        /* get the device addresses and interrupts */
-        if (ifunc != NULL)
-                mem_start = ifunc(np, mem_start, naddrc, nsizec);
-
-        if (use_of_interrupt_tree)
-                mem_start = finish_node_interrupts(np, mem_start);
-
-        /* Look for #address-cells and #size-cells properties. */
-        ip = (int *) get_property(np, "#address-cells", NULL);
-        if (ip != NULL)
-                naddrc = *ip;
-        ip = (int *) get_property(np, "#size-cells", NULL);
-        if (ip != NULL)
-                nsizec = *ip;
-
-        if (np->parent == NULL)
-                ifunc = interpret_root_props;
-        else if (np->type == 0)
-                ifunc = NULL;
-        else if (!strcmp(np->type, "pci") || !strcmp(np->type, "vci"))
-                ifunc = interpret_pci_props;
-        else if (!strcmp(np->type, "dbdma"))
-                ifunc = interpret_dbdma_props;
-        else if (!strcmp(np->type, "mac-io")
-                 || ifunc == interpret_macio_props)
-                ifunc = interpret_macio_props;
-        else if (!strcmp(np->type, "isa"))
-                ifunc = interpret_isa_props;
-        else if (!strcmp(np->name, "uni-n") || !strcmp(np->name, "u3"))
-                ifunc = interpret_root_props;
-        else if (!((ifunc == interpret_dbdma_props
-                    || ifunc == interpret_macio_props)
-                   && (!strcmp(np->type, "escc")
-                       || !strcmp(np->type, "media-bay"))))
-                ifunc = NULL;
-
-        /* if we were booted from BootX, convert the full name */
-        if (boot_infos
-            && strncmp(np->full_name, "Devices:device-tree", 19) == 0) {
-                if (np->full_name[19] == 0) {
-                        strcpy(np->full_name, "/");
-                } else if (np->full_name[19] == ':') {
-                        char *p = np->full_name + 19;
-                        np->full_name = p;
-                        for (; *p; ++p)
-                                if (*p == ':')
-                                        *p = '/';
-                }
-        }
-
-        for (child = np->child; child != NULL; child = child->sibling)
-                mem_start = finish_node(child, mem_start, ifunc,
-                                        naddrc, nsizec);
-
-        return mem_start;
-}
-
-/*
- * Find the interrupt parent of a node.
- */
-static struct device_node * __init
-intr_parent(struct device_node *p)
-{
-        phandle *parp;
-
-        parp = (phandle *) get_property(p, "interrupt-parent", NULL);
-        if (parp == NULL)
-                return p->parent;
-        p = find_phandle(*parp);
-        if (p != NULL)
-                return p;
-        /*
-         * On a powermac booted with BootX, we don't get to know the
-         * phandles for any nodes, so find_phandle will return NULL.
-         * Fortunately these machines only have one interrupt controller
-         * so there isn't in fact any ambiguity.  -- paulus
-         */
-        if (num_interrupt_controllers == 1)
-                p = dflt_interrupt_controller;
-        return p;
-}
-
-/*
- * Find out the size of each entry of the interrupts property
- * for a node.
- */
-static int __init
-prom_n_intr_cells(struct device_node *np)
-{
-        struct device_node *p;
-        unsigned int *icp;
-
-        for (p = np; (p = intr_parent(p)) != NULL; ) {
-                icp = (unsigned int *)
-                        get_property(p, "#interrupt-cells", NULL);
-                if (icp != NULL)
-                        return *icp;
-                if (get_property(p, "interrupt-controller", NULL) != NULL
-                    || get_property(p, "interrupt-map", NULL) != NULL) {
-                        printk("oops, node %s doesn't have #interrupt-cells\n",
-                               p->full_name);
-                        return 1;
-                }
-        }
-        printk("prom_n_intr_cells failed for %s\n", np->full_name);
-        return 1;
-}
-
-/*
- * Map an interrupt from a device up to the platform interrupt
- * descriptor.
- */
-static int __init
-map_interrupt(unsigned int **irq, struct device_node **ictrler,
-              struct device_node *np, unsigned int *ints, int nintrc)
-{
-        struct device_node *p, *ipar;
-        unsigned int *imap, *imask, *ip;
-        int i, imaplen, match;
-        int newintrc = 1, newaddrc = 1;
-        unsigned int *reg;
-        int naddrc;
-
-        reg = (unsigned int *) get_property(np, "reg", NULL);
-        naddrc = prom_n_addr_cells(np);
-        p = intr_parent(np);
-        while (p != NULL) {
-                if (get_property(p, "interrupt-controller", NULL) != NULL)
-                        /* this node is an interrupt controller, stop here */
-                        break;
-                imap = (unsigned int *)
-                        get_property(p, "interrupt-map", &imaplen);
-                if (imap == NULL) {
-                        p = intr_parent(p);
-                        continue;
-                }
-                imask = (unsigned int *)
-                        get_property(p, "interrupt-map-mask", NULL);
-                if (imask == NULL) {
-                        printk("oops, %s has interrupt-map but no mask\n",
-                               p->full_name);
-                        return 0;
-                }
-                imaplen /= sizeof(unsigned int);
-                match = 0;
-                ipar = NULL;
-                while (imaplen > 0 && !match) {
-                        /* check the child-interrupt field */
-                        match = 1;
-                        for (i = 0; i < naddrc && match; ++i)
-                                match = ((reg[i] ^ imap[i]) & imask[i]) == 0;
-                        for (; i < naddrc + nintrc && match; ++i)
-                                match = ((ints[i-naddrc] ^ imap[i]) & imask[i]) == 0;
-                        imap += naddrc + nintrc;
-                        imaplen -= naddrc + nintrc;
-                        /* grab the interrupt parent */
-                        ipar = find_phandle((phandle) *imap++);
-                        --imaplen;
-                        if (ipar == NULL && num_interrupt_controllers == 1)
-                                /* cope with BootX not giving us phandles */
-                                ipar = dflt_interrupt_controller;
-                        if (ipar == NULL) {
-                                printk("oops, no int parent %x in map of %s\n",
-                                       imap[-1], p->full_name);
-                                return 0;
-                        }
-                        /* find the parent's # addr and intr cells */
-                        ip = (unsigned int *)
-                                get_property(ipar, "#interrupt-cells", NULL);
-                        if (ip == NULL) {
-                                printk("oops, no #interrupt-cells on %s\n",
-                                       ipar->full_name);
-                                return 0;
-                        }
-                        newintrc = *ip;
-                        ip = (unsigned int *)
-                                get_property(ipar, "#address-cells", NULL);
-                        newaddrc = (ip == NULL)? 0: *ip;
-                        imap += newaddrc + newintrc;
-                        imaplen -= newaddrc + newintrc;
-                }
-                if (imaplen < 0) {
-                        printk("oops, error decoding int-map on %s, len=%d\n",
-                               p->full_name, imaplen);
-                        return 0;
-                }
-                if (!match) {
-                        printk("oops, no match in %s int-map for %s\n",
-                               p->full_name, np->full_name);
-                        return 0;
-                }
-                p = ipar;
-                naddrc = newaddrc;
-                nintrc = newintrc;
-                ints = imap - nintrc;
-                reg = ints - naddrc;
-        }
-        if (p == NULL)
-                printk("hmmm, int tree for %s doesn't have ctrler\n",
-                       np->full_name);
-        *irq = ints;
-        *ictrler = p;
-        return nintrc;
-}
-
-/*
- * New version of finish_node_interrupts.
- */
-static unsigned long __init
-finish_node_interrupts(struct device_node *np, unsigned long mem_start)
-{
-        unsigned int *ints;
-        int intlen, intrcells;
-        int i, j, n, offset;
-        unsigned int *irq;
-        struct device_node *ic;
-
-        ints = (unsigned int *) get_property(np, "interrupts", &intlen);
-        if (ints == NULL)
-                return mem_start;
-        intrcells = prom_n_intr_cells(np);
-        intlen /= intrcells * sizeof(unsigned int);
-        np->n_intrs = intlen;
-        np->intrs = (struct interrupt_info *) mem_start;
-        mem_start += intlen * sizeof(struct interrupt_info);
-
-        for (i = 0; i < intlen; ++i) {
-                np->intrs[i].line = 0;
-                np->intrs[i].sense = 1;
-                n = map_interrupt(&irq, &ic, np, ints, intrcells);
-                if (n <= 0)
-                        continue;
-                offset = 0;
-                /*
-                 * On a CHRP we have an 8259 which is subordinate to
-                 * the openpic in the interrupt tree, but we want the
-                 * openpic's interrupt numbers offsetted, not the 8259's.
-                 * So we apply the offset if the controller is at the
-                 * root of the interrupt tree, i.e. has no interrupt-parent.
-                 * This doesn't cope with the general case of multiple
-                 * cascaded interrupt controllers, but then neither will
-                 * irq.c at the moment either.  -- paulus
-                 * The G5 triggers that code, I add a machine test. On
-                 * those machines, we want to offset interrupts from the
-                 * second openpic by 128 -- BenH
-                 */
-                if (num_interrupt_controllers > 1
-                    && ic != NULL
-                    && get_property(ic, "interrupt-parent", NULL) == NULL)
-                        offset = 16;
-
-                np->intrs[i].line = irq[0] + offset;
-                if (n > 1)
-                        np->intrs[i].sense = irq[1];
-                if (n > 2) {
-                        printk("hmmm, got %d intr cells for %s:", n,
-                               np->full_name);
-                        for (j = 0; j < n; ++j)
-                                printk(" %d", irq[j]);
-                        printk("\n");
-                }
-                ints += intrcells;
-        }
-
-        return mem_start;
-}
-
-/*
- * When BootX makes a copy of the device tree from the MacOS
- * Name Registry, it is in the format we use but all of the pointers
- * are offsets from the start of the tree.
- * This procedure updates the pointers.
- */
-void __init
-relocate_nodes(void)
-{
-        unsigned long base;
-        struct device_node *np;
-        struct property *pp;
-
-#define ADDBASE(x)      (x = (typeof (x))((x)? ((unsigned long)(x) + base): 0))
-
-        base = (unsigned long) boot_infos + boot_infos->deviceTreeOffset;
-        allnodes = (struct device_node *)(base + 4);
-        for (np = allnodes; np != 0; np = np->allnext) {
-                ADDBASE(np->full_name);
-                ADDBASE(np->properties);
-                ADDBASE(np->parent);
-                ADDBASE(np->child);
-                ADDBASE(np->sibling);
-                ADDBASE(np->allnext);
-                for (pp = np->properties; pp != 0; pp = pp->next) {
-                        ADDBASE(pp->name);
-                        ADDBASE(pp->value);
-                        ADDBASE(pp->next);
-                }
-        }
-}
-
-int
-prom_n_addr_cells(struct device_node* np)
-{
-        int* ip;
-        do {
-                if (np->parent)
-                        np = np->parent;
-                ip = (int *) get_property(np, "#address-cells", NULL);
-                if (ip != NULL)
-                        return *ip;
-        } while (np->parent);
-        /* No #address-cells property for the root node, default to 1 */
-        return 1;
-}
-
-int
-prom_n_size_cells(struct device_node* np)
-{
-        int* ip;
-        do {
-                if (np->parent)
-                        np = np->parent;
-                ip = (int *) get_property(np, "#size-cells", NULL);
-                if (ip != NULL)
-                        return *ip;
-        } while (np->parent);
-        /* No #size-cells property for the root node, default to 1 */
-        return 1;
-}
-
-static unsigned long __init
-map_addr(struct device_node *np, unsigned long space, unsigned long addr)
-{
-        int na;
-        unsigned int *ranges;
-        int rlen = 0;
-        unsigned int type;
-
-        type = (space >> 24) & 3;
-        if (type == 0)
-                return addr;
-
-        while ((np = np->parent) != NULL) {
-                if (strcmp(np->type, "pci") != 0)
-                        continue;
-                /* PCI bridge: map the address through the ranges property */
-                na = prom_n_addr_cells(np);
-                ranges = (unsigned int *) get_property(np, "ranges", &rlen);
-                while ((rlen -= (na + 5) * sizeof(unsigned int)) >= 0) {
-                        if (((ranges[0] >> 24) & 3) == type
-                            && ranges[2] <= addr
-                            && addr - ranges[2] < ranges[na+4]) {
-                                /* ok, this matches, translate it */
-                                addr += ranges[na+2] - ranges[2];
-                                break;
-                        }
-                        ranges += na + 5;
-                }
-        }
-        return addr;
-}
-
-static unsigned long __init
-interpret_pci_props(struct device_node *np, unsigned long mem_start,
-                    int naddrc, int nsizec)
-{
-        struct address_range *adr;
-        struct pci_reg_property *pci_addrs;
-        int i, l, *ip;
-
-        pci_addrs = (struct pci_reg_property *)
-                get_property(np, "assigned-addresses", &l);
-        if (pci_addrs != 0 && l >= sizeof(struct pci_reg_property)) {
-                i = 0;
-                adr = (struct address_range *) mem_start;
-                while ((l -= sizeof(struct pci_reg_property)) >= 0) {
-                        adr[i].space = pci_addrs[i].addr.a_hi;
-                        adr[i].address = map_addr(np, pci_addrs[i].addr.a_hi,
-                                                  pci_addrs[i].addr.a_lo);
-                        adr[i].size = pci_addrs[i].size_lo;
-                        ++i;
-                }
-                np->addrs = adr;
-                np->n_addrs = i;
-                mem_start += i * sizeof(struct address_range);
-        }
-
-        if (use_of_interrupt_tree)
-                return mem_start;
-
-        ip = (int *) get_property(np, "AAPL,interrupts", &l);
-        if (ip == 0 && np->parent)
-                ip = (int *) get_property(np->parent, "AAPL,interrupts", &l);
-        if (ip == 0)
-                ip = (int *) get_property(np, "interrupts", &l);
-        if (ip != 0) {
-                np->intrs = (struct interrupt_info *) mem_start;
-                np->n_intrs = l / sizeof(int);
-                mem_start += np->n_intrs * sizeof(struct interrupt_info);
-                for (i = 0; i < np->n_intrs; ++i) {
-                        np->intrs[i].line = *ip++;
-                        np->intrs[i].sense = 1;
-                }
-        }
-
-        return mem_start;
-}
-
-static unsigned long __init
-interpret_dbdma_props(struct device_node *np, unsigned long mem_start,
-                      int naddrc, int nsizec)
-{
-        struct reg_property *rp;
-        struct address_range *adr;
-        unsigned long base_address;
-        int i, l, *ip;
-        struct device_node *db;
-
-        base_address = 0;
-        for (db = np->parent; db != NULL; db = db->parent) {
-                if (!strcmp(db->type, "dbdma") && db->n_addrs != 0) {
-                        base_address = db->addrs[0].address;
-                        break;
-                }
-        }
-
-        rp = (struct reg_property *) get_property(np, "reg", &l);
-        if (rp != 0 && l >= sizeof(struct reg_property)) {
-                i = 0;
-                adr = (struct address_range *) mem_start;
-                while ((l -= sizeof(struct reg_property)) >= 0) {
-                        adr[i].space = 2;
-                        adr[i].address = rp[i].address + base_address;
-                        adr[i].size = rp[i].size;
-                        ++i;
-                }
-                np->addrs = adr;
-                np->n_addrs = i;
-                mem_start += i * sizeof(struct address_range);
-        }
-
-        if (use_of_interrupt_tree)
-                return mem_start;
-
-        ip = (int *) get_property(np, "AAPL,interrupts", &l);
-        if (ip == 0)
-                ip = (int *) get_property(np, "interrupts", &l);
-        if (ip != 0) {
-                np->intrs = (struct interrupt_info *) mem_start;
-                np->n_intrs = l / sizeof(int);
-                mem_start += np->n_intrs * sizeof(struct interrupt_info);
-                for (i = 0; i < np->n_intrs; ++i) {
-                        np->intrs[i].line = *ip++;
-                        np->intrs[i].sense = 1;
-                }
-        }
-
-        return mem_start;
-}
-
-static unsigned long __init
-interpret_macio_props(struct device_node *np, unsigned long mem_start,
-                      int naddrc, int nsizec)
-{
-        struct reg_property *rp;
-        struct address_range *adr;
-        unsigned long base_address;
-        int i, l, *ip;
-        struct device_node *db;
-
-        base_address = 0;
-        for (db = np->parent; db != NULL; db = db->parent) {
-                if (!strcmp(db->type, "mac-io") && db->n_addrs != 0) {
-                        base_address = db->addrs[0].address;
-                        break;
-                }
-        }
-
-        rp = (struct reg_property *) get_property(np, "reg", &l);
-        if (rp != 0 && l >= sizeof(struct reg_property)) {
-                i = 0;
-                adr = (struct address_range *) mem_start;
-                while ((l -= sizeof(struct reg_property)) >= 0) {
-                        adr[i].space = 2;
-                        adr[i].address = rp[i].address + base_address;
-                        adr[i].size = rp[i].size;
-                        ++i;
-                }
-                np->addrs = adr;
-                np->n_addrs = i;
-                mem_start += i * sizeof(struct address_range);
-        }
-
-        if (use_of_interrupt_tree)
-                return mem_start;
-
-        ip = (int *) get_property(np, "interrupts", &l);
-        if (ip == 0)
-                ip = (int *) get_property(np, "AAPL,interrupts", &l);
-        if (ip != 0) {
-                np->intrs = (struct interrupt_info *) mem_start;
-                np->n_intrs = l / sizeof(int);
-                for (i = 0; i < np->n_intrs; ++i) {
-                        np->intrs[i].line = *ip++;
-                        np->intrs[i].sense = 1;
-                }
-                mem_start += np->n_intrs * sizeof(struct interrupt_info);
-        }
-
-        return mem_start;
-}
-
-static unsigned long __init
-interpret_isa_props(struct device_node *np, unsigned long mem_start,
-                    int naddrc, int nsizec)
-{
-        struct isa_reg_property *rp;
-        struct address_range *adr;
-        int i, l, *ip;
-
-        rp = (struct isa_reg_property *) get_property(np, "reg", &l);
-        if (rp != 0 && l >= sizeof(struct isa_reg_property)) {
-                i = 0;
-                adr = (struct address_range *) mem_start;
-                while ((l -= sizeof(struct reg_property)) >= 0) {
-                        adr[i].space = rp[i].space;
-                        adr[i].address = rp[i].address
-                                + (adr[i].space? 0: _ISA_MEM_BASE);
-                        adr[i].size = rp[i].size;
-                        ++i;
-                }
-                np->addrs = adr;
-                np->n_addrs = i;
-                mem_start += i * sizeof(struct address_range);
-        }
-
-        if (use_of_interrupt_tree)
-                return mem_start;
-
-        ip = (int *) get_property(np, "interrupts", &l);
-        if (ip != 0) {
-                np->intrs = (struct interrupt_info *) mem_start;
-                np->n_intrs = l / (2 * sizeof(int));
-                mem_start += np->n_intrs * sizeof(struct interrupt_info);
-                for (i = 0; i < np->n_intrs; ++i) {
-                        np->intrs[i].line = *ip++;
-                        np->intrs[i].sense = *ip++;
-                }
-        }
-
-        return mem_start;
-}
-
-static unsigned long __init
-interpret_root_props(struct device_node *np, unsigned long mem_start,
-                     int naddrc, int nsizec)
-{
-        struct address_range *adr;
-        int i, l, *ip;
-        unsigned int *rp;
-        int rpsize = (naddrc + nsizec) * sizeof(unsigned int);
-
-        rp = (unsigned int *) get_property(np, "reg", &l);
-        if (rp != 0 && l >= rpsize) {
-                i = 0;
-                adr = (struct address_range *) mem_start;
-                while ((l -= rpsize) >= 0) {
-                        adr[i].space = (naddrc >= 2? rp[naddrc-2]: 2);
-                        adr[i].address = rp[naddrc - 1];
-                        adr[i].size = rp[naddrc + nsizec - 1];
-                        ++i;
-                        rp += naddrc + nsizec;
-                }
-                np->addrs = adr;
-                np->n_addrs = i;
-                mem_start += i * sizeof(struct address_range);
-        }
-
-        if (use_of_interrupt_tree)
-                return mem_start;
-
-        ip = (int *) get_property(np, "AAPL,interrupts", &l);
-        if (ip == 0)
-                ip = (int *) get_property(np, "interrupts", &l);
-        if (ip != 0) {
-                np->intrs = (struct interrupt_info *) mem_start;
-                np->n_intrs = l / sizeof(int);
-                mem_start += np->n_intrs * sizeof(struct interrupt_info);
-                for (i = 0; i < np->n_intrs; ++i) {
-                        np->intrs[i].line = *ip++;
-                        np->intrs[i].sense = 1;
-                }
-        }
-
-        return mem_start;
-}
-
-/*
- * Work out the sense (active-low level / active-high edge)
- * of each interrupt from the device tree.
- */
-void __init
-prom_get_irq_senses(unsigned char *senses, int off, int max)
-{
-        struct device_node *np;
-        int i, j;
-
-        /* default to level-triggered */
-        memset(senses, 1, max - off);
-        if (!use_of_interrupt_tree)
-                return;
-
-        for (np = allnodes; np != 0; np = np->allnext) {
-                for (j = 0; j < np->n_intrs; j++) {
-                        i = np->intrs[j].line;
-                        if (i >= off && i < max) {
-                                if (np->intrs[j].sense == 1)
-                                        senses[i-off] = (IRQ_SENSE_LEVEL
-                                                | IRQ_POLARITY_NEGATIVE);
-                                else
-                                        senses[i-off] = (IRQ_SENSE_EDGE
-                                                | IRQ_POLARITY_POSITIVE);
-                        }
-                }
-        }
-}
-
-/*
- * Construct and return a list of the device_nodes with a given name.
- */
-struct device_node *
-find_devices(const char *name)
-{
-        struct device_node *head, **prevp, *np;
-
-        prevp = &head;
-        for (np = allnodes; np != 0; np = np->allnext) {
-                if (np->name != 0 && strcasecmp(np->name, name) == 0) {
-                        *prevp = np;
-                        prevp = &np->next;
-                }
-        }
-        *prevp = NULL;
-        return head;
-}
-
-/*
- * Construct and return a list of the device_nodes with a given type.
- */
-struct device_node *
-find_type_devices(const char *type)
-{
-        struct device_node *head, **prevp, *np;
-
-        prevp = &head;
-        for (np = allnodes; np != 0; np = np->allnext) {
-                if (np->type != 0 && strcasecmp(np->type, type) == 0) {
-                        *prevp = np;
-                        prevp = &np->next;
-                }
-        }
-        *prevp = NULL;
-        return head;
-}
-
-/*
- * Returns all nodes linked together
- */
-struct device_node *
-find_all_nodes(void)
-{
-        struct device_node *head, **prevp, *np;
-
-        prevp = &head;
-        for (np = allnodes; np != 0; np = np->allnext) {
-                *prevp = np;
-                prevp = &np->next;
-        }
-        *prevp = NULL;
-        return head;
-}
-
-/* Checks if the given "compat" string matches one of the strings in
- * the device's "compatible" property
- */
-int
-device_is_compatible(struct device_node *device, const char *compat)
-{
-        const char* cp;
-        int cplen, l;
-
-        cp = (char *) get_property(device, "compatible", &cplen);
-        if (cp == NULL)
-                return 0;
-        while (cplen > 0) {
-                if (strncasecmp(cp, compat, strlen(compat)) == 0)
-                        return 1;
-                l = strlen(cp) + 1;
-                cp += l;
-                cplen -= l;
-        }
-
-        return 0;
-}
-
-
-/*
- * Indicates whether the root node has a given value in its
- * compatible property.
- */
-int
-machine_is_compatible(const char *compat)
-{
-        struct device_node *root;
-
-        root = find_path_device("/");
-        if (root == 0)
-                return 0;
-        return device_is_compatible(root, compat);
-}
-
-/*
- * Construct and return a list of the device_nodes with a given type
- * and compatible property.
- */
-struct device_node *
-find_compatible_devices(const char *type, const char *compat)
-{
-        struct device_node *head, **prevp, *np;
-
-        prevp = &head;
-        for (np = allnodes; np != 0; np = np->allnext) {
-                if (type != NULL
-                    && !(np->type != 0 && strcasecmp(np->type, type) == 0))
-                        continue;
-                if (device_is_compatible(np, compat)) {
-                        *prevp = np;
-                        prevp = &np->next;
-                }
-        }
-        *prevp = NULL;
-        return head;
-}
-
-/*
- * Find the device_node with a given full_name.
- */
-struct device_node *
-find_path_device(const char *path)
-{
-        struct device_node *np;
-
-        for (np = allnodes; np != 0; np = np->allnext)
-                if (np->full_name != 0 && strcasecmp(np->full_name, path) == 0)
-                        return np;
-        return NULL;
-}
-
-/*******
- *
- * New implementation of the OF "find" APIs, return a refcounted
- * object, call of_node_put() when done. Currently, still lacks
- * locking as old implementation, this is beeing done for ppc64.
- *
- * Note that property management will need some locking as well,
- * this isn't dealt with yet
- *
- *******/
-
-/**
- *      of_find_node_by_name - Find a node by it's "name" property
- *      @from:  The node to start searching from or NULL, the node
- *              you pass will not be searched, only the next one
- *              will; typically, you pass what the previous call
- *              returned. of_node_put() will be called on it
- *      @name:  The name string to match against
- *
- *      Returns a node pointer with refcount incremented, use
- *      of_node_put() on it when done.
- */
-struct device_node *of_find_node_by_name(struct device_node *from,
-        const char *name)
-{
-        struct device_node *np = from ? from->allnext : allnodes;
-
-        for (; np != 0; np = np->allnext)
-                if (np->name != 0 && strcasecmp(np->name, name) == 0)
-                        break;
-        if (from)
-                of_node_put(from);
-        return of_node_get(np);
-}
-
-/**
- *      of_find_node_by_type - Find a node by it's "device_type" property
- *      @from:  The node to start searching from or NULL, the node
- *              you pass will not be searched, only the next one
- *              will; typically, you pass what the previous call
- *              returned. of_node_put() will be called on it
- *      @name:  The type string to match against
- *
- *      Returns a node pointer with refcount incremented, use
- *      of_node_put() on it when done.
- */
-struct device_node *of_find_node_by_type(struct device_node *from,
-        const char *type)
-{
-        struct device_node *np = from ? from->allnext : allnodes;
-
-        for (; np != 0; np = np->allnext)
-                if (np->type != 0 && strcasecmp(np->type, type) == 0)
-                        break;
-        if (from)
-                of_node_put(from);
-        return of_node_get(np);
-}
-
-/**
- *      of_find_compatible_node - Find a node based on type and one of the
- *                                tokens in it's "compatible" property
- *      @from:          The node to start searching from or NULL, the node
- *                      you pass will not be searched, only the next one
- *                      will; typically, you pass what the previous call
- *                      returned. of_node_put() will be called on it
- *      @type:          The type string to match "device_type" or NULL to ignore
- *      @compatible:    The string to match to one of the tokens in the device
- *                      "compatible" list.
- *
- *      Returns a node pointer with refcount incremented, use
- *      of_node_put() on it when done.
- */
-struct device_node *of_find_compatible_node(struct device_node *from,
-        const char *type, const char *compatible)
-{
-        struct device_node *np = from ? from->allnext : allnodes;
-
-        for (; np != 0; np = np->allnext) {
-                if (type != NULL
-                    && !(np->type != 0 && strcasecmp(np->type, type) == 0))
-                        continue;
-                if (device_is_compatible(np, compatible))
-                        break;
-        }
-        if (from)
-                of_node_put(from);
-        return of_node_get(np);
-}
-
-/**
- *      of_find_node_by_path - Find a node matching a full OF path
- *      @path:  The full path to match
- *
- *      Returns a node pointer with refcount incremented, use
- *      of_node_put() on it when done.
- */
-struct device_node *of_find_node_by_path(const char *path)
-{
-        struct device_node *np = allnodes;
-
-        for (; np != 0; np = np->allnext)
-                if (np->full_name != 0 && strcasecmp(np->full_name, path) == 0)
-                        break;
-        return of_node_get(np);
-}
-
-/**
- *      of_find_all_nodes - Get next node in global list
- *      @prev:  Previous node or NULL to start iteration
- *              of_node_put() will be called on it
- *
- *      Returns a node pointer with refcount incremented, use
- *      of_node_put() on it when done.
- */
-struct device_node *of_find_all_nodes(struct device_node *prev)
-{
-        return of_node_get(prev ? prev->allnext : allnodes);
-}
-
-/**
- *      of_get_parent - Get a node's parent if any
- *      @node:  Node to get parent
- *
- *      Returns a node pointer with refcount incremented, use
- *      of_node_put() on it when done.
- */
-struct device_node *of_get_parent(const struct device_node *node)
-{
-        return node ? of_node_get(node->parent) : NULL;
-}
-
-/**
- *      of_get_next_child - Iterate a node childs
- *      @node:  parent node
- *      @prev:  previous child of the parent node, or NULL to get first
- *
- *      Returns a node pointer with refcount incremented, use
- *      of_node_put() on it when done.
- */
-struct device_node *of_get_next_child(const struct device_node *node,
-                                      struct device_node *prev)
-{
-        struct device_node *next = prev ? prev->sibling : node->child;
-
-        for (; next != 0; next = next->sibling)
-                if (of_node_get(next))
-                        break;
-        if (prev)
-                of_node_put(prev);
-        return next;
-}
-
-/**
- *      of_node_get - Increment refcount of a node
- *      @node:  Node to inc refcount, NULL is supported to
- *              simplify writing of callers
- *
- *      Returns the node itself or NULL if gone. Current implementation
- *      does nothing as we don't yet do dynamic node allocation on ppc32
- */
-struct device_node *of_node_get(struct device_node *node)
-{
-        return node;
-}
-
-/**
- *      of_node_put - Decrement refcount of a node
- *      @node:  Node to dec refcount, NULL is supported to
- *              simplify writing of callers
- *
- *      Current implementation does nothing as we don't yet do dynamic node
- *      allocation on ppc32
- */
-void  of_node_put(struct device_node *node)
-{
-}
-
-/*
- * Find the device_node with a given phandle.
- */
-static struct device_node * __init
-find_phandle(phandle ph)
-{
-        struct device_node *np;
-
-        for (np = allnodes; np != 0; np = np->allnext)
-                if (np->node == ph)
-                        return np;
-        return NULL;
-}
-
-/*
- * Find a property with a given name for a given node
- * and return the value.
- */
-unsigned char *
-get_property(struct device_node *np, const char *name, int *lenp)
-{
-        struct property *pp;
-
-        for (pp = np->properties; pp != 0; pp = pp->next)
-                if (pp->name != NULL && strcmp(pp->name, name) == 0) {
-                        if (lenp != 0)
-                                *lenp = pp->length;
-                        return pp->value;
-                }
-        return NULL;
-}
-
-/*
- * Add a property to a node
- */
-int
-prom_add_property(struct device_node* np, struct property* prop)
-{
-        struct property **next = &np->properties;
-
-        prop->next = NULL;
-        while (*next)
-                next = &(*next)->next;
-        *next = prop;
-
-        return 0;
-}
-
-/* I quickly hacked that one, check against spec ! */
-static inline unsigned long
-bus_space_to_resource_flags(unsigned int bus_space)
-{
-        u8 space = (bus_space >> 24) & 0xf;
-        if (space == 0)
-                space = 0x02;
-        if (space == 0x02)
-                return IORESOURCE_MEM;
-        else if (space == 0x01)
-                return IORESOURCE_IO;
-        else {
-                printk(KERN_WARNING "prom.c: bus_space_to_resource_flags(), space: %x\n",
-                        bus_space);
-                return 0;
-        }
-}
-
-static struct resource*
-find_parent_pci_resource(struct pci_dev* pdev, struct address_range *range)
-{
-        unsigned long mask;
-        int i;
-
-        /* Check this one */
-        mask = bus_space_to_resource_flags(range->space);
-        for (i=0; i<DEVICE_COUNT_RESOURCE; i++) {
-                if ((pdev->resource[i].flags & mask) == mask &&
-                        pdev->resource[i].start <= range->address &&
-                        pdev->resource[i].end > range->address) {
-                                if ((range->address + range->size - 1) > pdev->resource[i].end) {
-                                        /* Add better message */
-                                        printk(KERN_WARNING "PCI/OF resource overlap !\n");
-                                        return NULL;
-                                }
-                                break;
-                        }
-        }
-        if (i == DEVICE_COUNT_RESOURCE)
-                return NULL;
-        return &pdev->resource[i];
-}
-
-/*
- * Request an OF device resource. Currently handles child of PCI devices,
- * or other nodes attached to the root node. Ultimately, put some
- * link to resources in the OF node.
- */
-struct resource*
-request_OF_resource(struct device_node* node, int index, const char* name_postfix)
-{
-        struct pci_dev* pcidev;
-        u8 pci_bus, pci_devfn;
-        unsigned long iomask;
-        struct device_node* nd;
-        struct resource* parent;
-        struct resource *res = NULL;
-        int nlen, plen;
-
-        if (index >= node->n_addrs)
-                goto fail;
-
-        /* Sanity check on bus space */
-        iomask = bus_space_to_resource_flags(node->addrs[index].space);
-        if (iomask & IORESOURCE_MEM)
-                parent = &iomem_resource;
-        else if (iomask & IORESOURCE_IO)
-                parent = &ioport_resource;
-        else
-                goto fail;
-
-        /* Find a PCI parent if any */
-        nd = node;
-        pcidev = NULL;
-        while(nd) {
-                if (!pci_device_from_OF_node(nd, &pci_bus, &pci_devfn))
-                        pcidev = pci_find_slot(pci_bus, pci_devfn);
-                if (pcidev) break;
-                nd = nd->parent;
-        }
-        if (pcidev)
-                parent = find_parent_pci_resource(pcidev, &node->addrs[index]);
-        if (!parent) {
-                printk(KERN_WARNING "request_OF_resource(%s), parent not found\n",
-                        node->name);
-                goto fail;
-        }
-
-        res = __request_region(parent, node->addrs[index].address, node->addrs[index].size, NULL);
-        if (!res)
-                goto fail;
-        nlen = strlen(node->name);
-        plen = name_postfix ? strlen(name_postfix) : 0;
-        res->name = (const char *)kmalloc(nlen+plen+1, GFP_KERNEL);
-        if (res->name) {
-                strcpy((char *)res->name, node->name);
-                if (plen)
-                        strcpy((char *)res->name+nlen, name_postfix);
-        }
-        return res;
-fail:
-        return NULL;
-}
-
-int
-release_OF_resource(struct device_node* node, int index)
-{
-        struct pci_dev* pcidev;
-        u8 pci_bus, pci_devfn;
-        unsigned long iomask, start, end;
-        struct device_node* nd;
-        struct resource* parent;
-        struct resource *res = NULL;
-
-        if (index >= node->n_addrs)
-                return -EINVAL;
-
-        /* Sanity check on bus space */
-        iomask = bus_space_to_resource_flags(node->addrs[index].space);
-        if (iomask & IORESOURCE_MEM)
-                parent = &iomem_resource;
-        else if (iomask & IORESOURCE_IO)
-                parent = &ioport_resource;
-        else
-                return -EINVAL;
-
-        /* Find a PCI parent if any */
-        nd = node;
-        pcidev = NULL;
-        while(nd) {
-                if (!pci_device_from_OF_node(nd, &pci_bus, &pci_devfn))
-                        pcidev = pci_find_slot(pci_bus, pci_devfn);
-                if (pcidev) break;
-                nd = nd->parent;
-        }
-        if (pcidev)
-                parent = find_parent_pci_resource(pcidev, &node->addrs[index]);
-        if (!parent) {
-                printk(KERN_WARNING "release_OF_resource(%s), parent not found\n",
-                        node->name);
-                return -ENODEV;
-        }
-
-        /* Find us in the parent and its childs */
-        res = parent->child;
-        start = node->addrs[index].address;
-        end = start + node->addrs[index].size - 1;
-        while (res) {
-                if (res->start == start && res->end == end &&
-                    (res->flags & IORESOURCE_BUSY))
-                        break;
-                if (res->start <= start && res->end >= end)
-                        res = res->child;
-                else
-                        res = res->sibling;
-        }
-        if (!res)
-                return -ENODEV;
-
-        kfree(res->name);
-        res->name = NULL;
-        release_resource(res);
-        kfree(res);
-
-        return 0;
-}
-
-#if 0
-void
-print_properties(struct device_node *np)
-{
-        struct property *pp;
-        char *cp;
-        int i, n;
-
-        for (pp = np->properties; pp != 0; pp = pp->next) {
-                printk(KERN_INFO "%s", pp->name);
-                for (i = strlen(pp->name); i < 16; ++i)
-                        printk(" ");
-                cp = (char *) pp->value;
-                for (i = pp->length; i > 0; --i, ++cp)
-                        if ((i > 1 && (*cp < 0x20 || *cp > 0x7e))
-                            || (i == 1 && *cp != 0))
-                                break;
-                if (i == 0 && pp->length > 1) {
-                        /* looks like a string */
-                        printk(" %s\n", (char *) pp->value);
-                } else {
-                        /* dump it in hex */
-                        n = pp->length;
-                        if (n > 64)
-                                n = 64;
-                        if (pp->length % 4 == 0) {
-                                unsigned int *p = (unsigned int *) pp->value;
-
-                                n /= 4;
-                                for (i = 0; i < n; ++i) {
-                                        if (i != 0 && (i % 4) == 0)
-                                                printk("\n                ");
-                                        printk(" %08x", *p++);
-                                }
-                        } else {
-                                unsigned char *bp = pp->value;
-
-                                for (i = 0; i < n; ++i) {
-                                        if (i != 0 && (i % 16) == 0)
-                                                printk("\n                ");
-                                        printk(" %02x", *bp++);
-                                }
-                        }
-                        printk("\n");
-                        if (pp->length > 64)
-                                printk("                 ... (length = %d)\n",
-                                       pp->length);
-                }
-        }
-}
-#endif
-
-static DEFINE_SPINLOCK(rtas_lock);
-
-/* this can be called after setup -- Cort */
-int
-call_rtas(const char *service, int nargs, int nret,
-          unsigned long *outputs, ...)
-{
-        va_list list;
-        int i;
-        unsigned long s;
-        struct device_node *rtas;
-        int *tokp;
-        union {
-                unsigned long words[16];
-                double align;
-        } u;
-
-        rtas = find_devices("rtas");
-        if (rtas == NULL)
-                return -1;
-        tokp = (int *) get_property(rtas, service, NULL);
-        if (tokp == NULL) {
-                printk(KERN_ERR "No RTAS service called %s\n", service);
-                return -1;
-        }
-        u.words[0] = *tokp;
-        u.words[1] = nargs;
-        u.words[2] = nret;
-        va_start(list, outputs);
-        for (i = 0; i < nargs; ++i)
-                u.words[i+3] = va_arg(list, unsigned long);
-        va_end(list);
-
-        /*
-         * RTAS doesn't use floating point.
-         * Or at least, according to the CHRP spec we enter RTAS
-         * with FP disabled, and it doesn't change the FP registers.
-         *  -- paulus.
-         */
-        spin_lock_irqsave(&rtas_lock, s);
-        enter_rtas((void *)__pa(&u));
-        spin_unlock_irqrestore(&rtas_lock, s);
-
-        if (nret > 1 && outputs != NULL)
-                for (i = 0; i < nret-1; ++i)
-                        outputs[i] = u.words[i+nargs+4];
-        return u.words[nargs+3];
-}
diff --git a/arch/ppc/syslib/prom_init.c b/arch/ppc/syslib/prom_init.c
deleted file mode 100644
index df14422ae1c6..000000000000
--- a/arch/ppc/syslib/prom_init.c
+++ /dev/null
@@ -1,1011 +0,0 @@
-/*
- * Note that prom_init() and anything called from prom_init()
- * may be running at an address that is different from the address
- * that it was linked at.  References to static data items are
- * handled by compiling this file with -mrelocatable-lib.
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/threads.h>
-#include <linux/spinlock.h>
-#include <linux/ioport.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/bitops.h>
-
-#include <asm/sections.h>
-#include <asm/prom.h>
-#include <asm/page.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/smp.h>
-#include <asm/bootx.h>
-#include <asm/system.h>
-#include <asm/mmu.h>
-#include <asm/pgtable.h>
-#include <asm/bootinfo.h>
-#include <asm/btext.h>
-#include <asm/pci-bridge.h>
-#include <asm/open_pic.h>
-#include <asm/cacheflush.h>
-
-#ifdef CONFIG_LOGO_LINUX_CLUT224
-#include <linux/linux_logo.h>
-extern const struct linux_logo logo_linux_clut224;
-#endif
-
-/*
- * Properties whose value is longer than this get excluded from our
- * copy of the device tree.  This way we don't waste space storing
- * things like "driver,AAPL,MacOS,PowerPC" properties.  But this value
- * does need to be big enough to ensure that we don't lose things
- * like the interrupt-map property on a PCI-PCI bridge.
- */
-#define MAX_PROPERTY_LENGTH     4096
-
-#ifndef FB_MAX                  /* avoid pulling in all of the fb stuff */
-#define FB_MAX  8
-#endif
-
-#define ALIGNUL(x) (((x) + sizeof(unsigned long)-1) & -sizeof(unsigned long))
-
-typedef u32 prom_arg_t;
-
-struct prom_args {
-        const char *service;
-        int nargs;
-        int nret;
-        prom_arg_t args[10];
-};
-
-struct pci_address {
-        unsigned a_hi;
-        unsigned a_mid;
-        unsigned a_lo;
-};
-
-struct pci_reg_property {
-        struct pci_address addr;
-        unsigned size_hi;
-        unsigned size_lo;
-};
-
-struct pci_range {
-        struct pci_address addr;
-        unsigned phys;
-        unsigned size_hi;
-        unsigned size_lo;
-};
-
-struct isa_reg_property {
-        unsigned space;
-        unsigned address;
-        unsigned size;
-};
-
-struct pci_intr_map {
-        struct pci_address addr;
-        unsigned dunno;
-        phandle int_ctrler;
-        unsigned intr;
-};
-
-static void prom_exit(void);
-static int  call_prom(const char *service, int nargs, int nret, ...);
-static int  call_prom_ret(const char *service, int nargs, int nret,
-                          prom_arg_t *rets, ...);
-static void prom_print_hex(unsigned int v);
-static int  prom_set_color(ihandle ih, int i, int r, int g, int b);
-static int  prom_next_node(phandle *nodep);
-static unsigned long check_display(unsigned long mem);
-static void setup_disp_fake_bi(ihandle dp);
-static unsigned long copy_device_tree(unsigned long mem_start,
-                                unsigned long mem_end);
-static unsigned long inspect_node(phandle node, struct device_node *dad,
-                                unsigned long mem_start, unsigned long mem_end,
-                                struct device_node ***allnextpp);
-static void prom_hold_cpus(unsigned long mem);
-static void prom_instantiate_rtas(void);
-static void * early_get_property(unsigned long base, unsigned long node,
-                                char *prop);
-
-prom_entry prom __initdata;
-ihandle prom_chosen __initdata;
-ihandle prom_stdout __initdata;
-
-static char *prom_display_paths[FB_MAX] __initdata;
-static phandle prom_display_nodes[FB_MAX] __initdata;
-static unsigned int prom_num_displays __initdata;
-static ihandle prom_disp_node __initdata;
-char *of_stdout_device __initdata;
-
-unsigned int rtas_data;   /* physical pointer */
-unsigned int rtas_entry;  /* physical pointer */
-unsigned int rtas_size;
-unsigned int old_rtas;
-
-boot_infos_t *boot_infos;
-char *bootpath;
-char *bootdevice;
-struct device_node *allnodes;
-
-extern char *klimit;
-
-static void __init
-prom_exit(void)
-{
-        struct prom_args args;
-
-        args.service = "exit";
-        args.nargs = 0;
-        args.nret = 0;
-        prom(&args);
-        for (;;)                        /* should never get here */
-                ;
-}
-
-static int __init
-call_prom(const char *service, int nargs, int nret, ...)
-{
-        va_list list;
-        int i;
-        struct prom_args prom_args;
-
-        prom_args.service = service;
-        prom_args.nargs = nargs;
-        prom_args.nret = nret;
-        va_start(list, nret);
-        for (i = 0; i < nargs; ++i)
-                prom_args.args[i] = va_arg(list, prom_arg_t);
-        va_end(list);
-        for (i = 0; i < nret; ++i)
-                prom_args.args[i + nargs] = 0;
-        prom(&prom_args);
-        return prom_args.args[nargs];
-}
-
-static int __init
-call_prom_ret(const char *service, int nargs, int nret, prom_arg_t *rets, ...)
-{
-        va_list list;
-        int i;
-        struct prom_args prom_args;
-
-        prom_args.service = service;
-        prom_args.nargs = nargs;
-        prom_args.nret = nret;
-        va_start(list, rets);
-        for (i = 0; i < nargs; ++i)
-                prom_args.args[i] = va_arg(list, int);
-        va_end(list);
-        for (i = 0; i < nret; ++i)
-                prom_args.args[i + nargs] = 0;
-        prom(&prom_args);
-        for (i = 1; i < nret; ++i)
-                rets[i-1] = prom_args.args[nargs + i];
-        return prom_args.args[nargs];
-}
-
-void __init
-prom_print(const char *msg)
-{
-        const char *p, *q;
-
-        if (prom_stdout == 0)
-                return;
-
-        for (p = msg; *p != 0; p = q) {
-                for (q = p; *q != 0 && *q != '\n'; ++q)
-                        ;
-                if (q > p)
-                        call_prom("write", 3, 1, prom_stdout, p, q - p);
-                if (*q != 0) {
-                        ++q;
-                        call_prom("write", 3, 1, prom_stdout, "\r\n", 2);
-                }
-        }
-}
-
-static void __init
-prom_print_hex(unsigned int v)
-{
-        char buf[16];
-        int i, c;
-
-        for (i = 0; i < 8; ++i) {
-                c = (v >> ((7-i)*4)) & 0xf;
-                c += (c >= 10)? ('a' - 10): '0';
-                buf[i] = c;
-        }
-        buf[i] = ' ';
-        buf[i+1] = 0;
-        prom_print(buf);
-}
-
-static int __init
-prom_set_color(ihandle ih, int i, int r, int g, int b)
-{
-        return call_prom("call-method", 6, 1, "color!", ih, i, b, g, r);
-}
-
-static int __init
-prom_next_node(phandle *nodep)
-{
-        phandle node;
-
-        if ((node = *nodep) != 0
-            && (*nodep = call_prom("child", 1, 1, node)) != 0)
-                return 1;
-        if ((*nodep = call_prom("peer", 1, 1, node)) != 0)
-                return 1;
-        for (;;) {
-                if ((node = call_prom("parent", 1, 1, node)) == 0)
-                        return 0;
-                if ((*nodep = call_prom("peer", 1, 1, node)) != 0)
-                        return 1;
-        }
-}
-
-#ifdef CONFIG_POWER4
-/*
- * Set up a hash table with a set of entries in it to map the
- * first 64MB of RAM.  This is used on 64-bit machines since
- * some of them don't have BATs.
- */
-
-static inline void make_pte(unsigned long htab, unsigned int hsize,
-                            unsigned int va, unsigned int pa, int mode)
-{
-        unsigned int *pteg;
-        unsigned int hash, i, vsid;
-
-        vsid = ((va >> 28) * 0x111) << 12;
-        hash = ((va ^ vsid) >> 5) & 0x7fff80;
-        pteg = (unsigned int *)(htab + (hash & (hsize - 1)));
-        for (i = 0; i < 8; ++i, pteg += 4) {
-                if ((pteg[1] & 1) == 0) {
-                        pteg[1] = vsid | ((va >> 16) & 0xf80) | 1;
-                        pteg[3] = pa | mode;
-                        break;
-                }
-        }
-}
-
-extern unsigned long _SDR1;
-extern PTE *Hash;
-extern unsigned long Hash_size;
-
-static void __init
-prom_alloc_htab(void)
-{
-        unsigned int hsize;
-        unsigned long htab;
-        unsigned int addr;
-
-        /*
-         * Because of OF bugs we can't use the "claim" client
-         * interface to allocate memory for the hash table.
-         * This code is only used on 64-bit PPCs, and the only
-         * 64-bit PPCs at the moment are RS/6000s, and their
-         * OF is based at 0xc00000 (the 12M point), so we just
-         * arbitrarily use the 0x800000 - 0xc00000 region for the
-         * hash table.
-         *  -- paulus.
-         */
-        hsize = 4 << 20;        /* POWER4 has no BATs */
-        htab = (8 << 20);
-        call_prom("claim", 3, 1, htab, hsize, 0);
-        Hash = (void *)(htab + KERNELBASE);
-        Hash_size = hsize;
-        _SDR1 = htab + __ilog2(hsize) - 18;
-
-        /*
-         * Put in PTEs for the first 64MB of RAM
-         */
-        memset((void *)htab, 0, hsize);
-        for (addr = 0; addr < 0x4000000; addr += 0x1000)
-                make_pte(htab, hsize, addr + KERNELBASE, addr,
-                         _PAGE_ACCESSED | _PAGE_COHERENT | PP_RWXX);
-#if 0 /* DEBUG stuff mapping the SCC */
-        make_pte(htab, hsize, 0x80013000, 0x80013000,
-                 _PAGE_ACCESSED | _PAGE_NO_CACHE | _PAGE_GUARDED | PP_RWXX);
-#endif
-}
-#endif /* CONFIG_POWER4 */
-
-
-/*
- * If we have a display that we don't know how to drive,
- * we will want to try to execute OF's open method for it
- * later.  However, OF will probably fall over if we do that
- * we've taken over the MMU.
- * So we check whether we will need to open the display,
- * and if so, open it now.
- */
-static unsigned long __init
-check_display(unsigned long mem)
-{
-        phandle node;
-        ihandle ih;
-        int i, j;
-        char type[16], *path;
-        static unsigned char default_colors[] = {
-                0x00, 0x00, 0x00,
-                0x00, 0x00, 0xaa,
-                0x00, 0xaa, 0x00,
-                0x00, 0xaa, 0xaa,
-                0xaa, 0x00, 0x00,
-                0xaa, 0x00, 0xaa,
-                0xaa, 0xaa, 0x00,
-                0xaa, 0xaa, 0xaa,
-                0x55, 0x55, 0x55,
-                0x55, 0x55, 0xff,
-                0x55, 0xff, 0x55,
-                0x55, 0xff, 0xff,
-                0xff, 0x55, 0x55,
-                0xff, 0x55, 0xff,
-                0xff, 0xff, 0x55,
-                0xff, 0xff, 0xff
-        };
-        const unsigned char *clut;
-
-        prom_disp_node = 0;
-
-        for (node = 0; prom_next_node(&node); ) {
-                type[0] = 0;
-                call_prom("getprop", 4, 1, node, "device_type",
-                          type, sizeof(type));
-                if (strcmp(type, "display") != 0)
-                        continue;
-                /* It seems OF doesn't null-terminate the path :-( */
-                path = (char *) mem;
-                memset(path, 0, 256);
-                if (call_prom("package-to-path", 3, 1, node, path, 255) < 0)
-                        continue;
-
-                /*
-                 * If this display is the device that OF is using for stdout,
-                 * move it to the front of the list.
-                 */
-                mem += strlen(path) + 1;
-                i = prom_num_displays++;
-                if (of_stdout_device != 0 && i > 0
-                    && strcmp(of_stdout_device, path) == 0) {
-                        for (; i > 0; --i) {
-                                prom_display_paths[i]
-                                        = prom_display_paths[i-1];
-                                prom_display_nodes[i]
-                                        = prom_display_nodes[i-1];
-                        }
-                }
-                prom_display_paths[i] = path;
-                prom_display_nodes[i] = node;
-                if (i == 0)
-                        prom_disp_node = node;
-                if (prom_num_displays >= FB_MAX)
-                        break;
-        }
-
-        for (j=0; j<prom_num_displays; j++) {
-                path = prom_display_paths[j];
-                node = prom_display_nodes[j];
-                prom_print("opening display ");
-                prom_print(path);
-                ih = call_prom("open", 1, 1, path);
-                if (ih == 0 || ih == (ihandle) -1) {
-                        prom_print("... failed\n");
-                        for (i=j+1; i<prom_num_displays; i++) {
-                                prom_display_paths[i-1] = prom_display_paths[i];
-                                prom_display_nodes[i-1] = prom_display_nodes[i];
-                        }
-                        if (--prom_num_displays > 0) {
-                                prom_disp_node = prom_display_nodes[j];
-                                j--;
-                        } else
-                                prom_disp_node = 0;
-                        continue;
-                } else {
-                        prom_print("... ok\n");
-                        call_prom("setprop", 4, 1, node, "linux,opened", 0, 0);
-
-                        /*
-                         * Setup a usable color table when the appropriate
-                         * method is available.
-                         * Should update this to use set-colors.
-                         */
-                        clut = default_colors;
-                        for (i = 0; i < 32; i++, clut += 3)
-                                if (prom_set_color(ih, i, clut[0], clut[1],
-                                                   clut[2]) != 0)
-                                        break;
-
-#ifdef CONFIG_LOGO_LINUX_CLUT224
-                        clut = PTRRELOC(logo_linux_clut224.clut);
-                        for (i = 0; i < logo_linux_clut224.clutsize;
-                             i++, clut += 3)
-                                if (prom_set_color(ih, i + 32, clut[0],
-                                                   clut[1], clut[2]) != 0)
-                                        break;
-#endif /* CONFIG_LOGO_LINUX_CLUT224 */
-                }
-        }
-        
-        if (prom_stdout) {
-                phandle p;
-                p = call_prom("instance-to-package", 1, 1, prom_stdout);
-                if (p && p != -1) {
-                        type[0] = 0;
-                        call_prom("getprop", 4, 1, p, "device_type",
-                                  type, sizeof(type));
-                        if (strcmp(type, "display") == 0)
-                                call_prom("setprop", 4, 1, p, "linux,boot-display",
-                                          0, 0);
-                }
-        }
-
-        return ALIGNUL(mem);
-}
-
-/* This function will enable the early boot text when doing OF booting. This
- * way, xmon output should work too
- */
-static void __init
-setup_disp_fake_bi(ihandle dp)
-{
-#ifdef CONFIG_BOOTX_TEXT
-        int width = 640, height = 480, depth = 8, pitch;
-        unsigned address;
-        struct pci_reg_property addrs[8];
-        int i, naddrs;
-        char name[32];
-        char *getprop = "getprop";
-
-        prom_print("Initializing fake screen: ");
-
-        memset(name, 0, sizeof(name));
-        call_prom(getprop, 4, 1, dp, "name", name, sizeof(name));
-        name[sizeof(name)-1] = 0;
-        prom_print(name);
-        prom_print("\n");
-        call_prom(getprop, 4, 1, dp, "width", &width, sizeof(width));
-        call_prom(getprop, 4, 1, dp, "height", &height, sizeof(height));
-        call_prom(getprop, 4, 1, dp, "depth", &depth, sizeof(depth));
-        pitch = width * ((depth + 7) / 8);
-        call_prom(getprop, 4, 1, dp, "linebytes",
-                  &pitch, sizeof(pitch));
-        if (pitch == 1)
-                pitch = 0x1000;         /* for strange IBM display */
-        address = 0;
-        call_prom(getprop, 4, 1, dp, "address",
-                  &address, sizeof(address));
-        if (address == 0) {
-                /* look for an assigned address with a size of >= 1MB */
-                naddrs = call_prom(getprop, 4, 1, dp, "assigned-addresses",
-                                   addrs, sizeof(addrs));
-                naddrs /= sizeof(struct pci_reg_property);
-                for (i = 0; i < naddrs; ++i) {
-                        if (addrs[i].size_lo >= (1 << 20)) {
-                                address = addrs[i].addr.a_lo;
-                                /* use the BE aperture if possible */
-                                if (addrs[i].size_lo >= (16 << 20))
-                                        address += (8 << 20);
-                                break;
-                        }
-                }
-                if (address == 0) {
-                        prom_print("Failed to get address\n");
-                        return;
-                }
-        }
-        /* kludge for valkyrie */
-        if (strcmp(name, "valkyrie") == 0)
-                address += 0x1000;
-
-#ifdef CONFIG_POWER4
-#if CONFIG_TASK_SIZE > 0x80000000
-#error CONFIG_TASK_SIZE cannot be above 0x80000000 with BOOTX_TEXT on G5
-#endif
-        {
-                extern boot_infos_t disp_bi;
-                unsigned long va, pa, i, offset;
-                va = 0x90000000;
-                pa = address & 0xfffff000ul;
-                offset = address & 0x00000fff;
-
-                for (i=0; i<0x4000; i++) {  
-                        make_pte((unsigned long)Hash - KERNELBASE, Hash_size, va, pa, 
-                                 _PAGE_ACCESSED | _PAGE_NO_CACHE |
-                                 _PAGE_GUARDED | PP_RWXX);
-                        va += 0x1000;
-                        pa += 0x1000;
-                }
-                btext_setup_display(width, height, depth, pitch, 0x90000000 | offset);
-                disp_bi.dispDeviceBase = (u8 *)address;
-        }
-#else /* CONFIG_POWER4 */
-        btext_setup_display(width, height, depth, pitch, address);
-        btext_prepare_BAT();
-#endif /* CONFIG_POWER4 */
-#endif /* CONFIG_BOOTX_TEXT */
-}
-
-/*
- * Make a copy of the device tree from the PROM.
- */
-static unsigned long __init
-copy_device_tree(unsigned long mem_start, unsigned long mem_end)
-{
-        phandle root;
-        unsigned long new_start;
-        struct device_node **allnextp;
-
-        root = call_prom("peer", 1, 1, (phandle)0);
-        if (root == (phandle)0) {
-                prom_print("couldn't get device tree root\n");
-                prom_exit();
-        }
-        allnextp = &allnodes;
-        mem_start = ALIGNUL(mem_start);
-        new_start = inspect_node(root, NULL, mem_start, mem_end, &allnextp);
-        *allnextp = NULL;
-        return new_start;
-}
-
-static unsigned long __init
-inspect_node(phandle node, struct device_node *dad,
-             unsigned long mem_start, unsigned long mem_end,
-             struct device_node ***allnextpp)
-{
-        int l;
-        phandle child;
-        struct device_node *np;
-        struct property *pp, **prev_propp;
-        char *prev_name, *namep;
-        unsigned char *valp;
-
-        np = (struct device_node *) mem_start;
-        mem_start += sizeof(struct device_node);
-        memset(np, 0, sizeof(*np));
-        np->node = node;
-        **allnextpp = PTRUNRELOC(np);
-        *allnextpp = &np->allnext;
-        if (dad != 0) {
-                np->parent = PTRUNRELOC(dad);
-                /* we temporarily use the `next' field as `last_child'. */
-                if (dad->next == 0)
-                        dad->child = PTRUNRELOC(np);
-                else
-                        dad->next->sibling = PTRUNRELOC(np);
-                dad->next = np;
-        }
-
-        /* get and store all properties */
-        prev_propp = &np->properties;
-        prev_name = "";
-        for (;;) {
-                pp = (struct property *) mem_start;
-                namep = (char *) (pp + 1);
-                pp->name = PTRUNRELOC(namep);
-                if (call_prom("nextprop", 3, 1, node, prev_name, namep) <= 0)
-                        break;
-                mem_start = ALIGNUL((unsigned long)namep + strlen(namep) + 1);
-                prev_name = namep;
-                valp = (unsigned char *) mem_start;
-                pp->value = PTRUNRELOC(valp);
-                pp->length = call_prom("getprop", 4, 1, node, namep,
-                                       valp, mem_end - mem_start);
-                if (pp->length < 0)
-                        continue;
-#ifdef MAX_PROPERTY_LENGTH
-                if (pp->length > MAX_PROPERTY_LENGTH)
-                        continue; /* ignore this property */
-#endif
-                mem_start = ALIGNUL(mem_start + pp->length);
-                *prev_propp = PTRUNRELOC(pp);
-                prev_propp = &pp->next;
-        }
-        if (np->node != 0) {
-                /* Add a "linux,phandle" property" */
-                pp = (struct property *) mem_start;
-                *prev_propp = PTRUNRELOC(pp);
-                prev_propp = &pp->next;
-                namep = (char *) (pp + 1);
-                pp->name = PTRUNRELOC(namep);
-                strcpy(namep, "linux,phandle");
-                mem_start = ALIGNUL((unsigned long)namep + strlen(namep) + 1);
-                pp->value = (unsigned char *) PTRUNRELOC(&np->node);
-                pp->length = sizeof(np->node);
-        }
-        *prev_propp = NULL;
-
-        /* get the node's full name */
-        l = call_prom("package-to-path", 3, 1, node,
-                      mem_start, mem_end - mem_start);
-        if (l >= 0) {
-                char *p, *ep;
-
-                np->full_name = PTRUNRELOC((char *) mem_start);
-                *(char *)(mem_start + l) = 0;
-                /* Fixup an Apple bug where they have bogus \0 chars in the
-                 * middle of the path in some properties
-                 */
-                for (p = (char *)mem_start, ep = p + l; p < ep; p++)
-                        if ((*p) == '\0') {
-                                memmove(p, p+1, ep - p);
-                                ep--;
-                        }
-                mem_start = ALIGNUL(mem_start + l + 1);
-        }
-
-        /* do all our children */
-        child = call_prom("child", 1, 1, node);
-        while (child != 0) {
-                mem_start = inspect_node(child, np, mem_start, mem_end,
-                                         allnextpp);
-                child = call_prom("peer", 1, 1, child);
-        }
-
-        return mem_start;
-}
-
-unsigned long smp_chrp_cpu_nr __initdata = 0;
-
-/*
- * With CHRP SMP we need to use the OF to start the other
- * processors so we can't wait until smp_boot_cpus (the OF is
- * trashed by then) so we have to put the processors into
- * a holding pattern controlled by the kernel (not OF) before
- * we destroy the OF.
- *
- * This uses a chunk of high memory, puts some holding pattern
- * code there and sends the other processors off to there until
- * smp_boot_cpus tells them to do something.  We do that by using
- * physical address 0x0.  The holding pattern checks that address
- * until its cpu # is there, when it is that cpu jumps to
- * __secondary_start().  smp_boot_cpus() takes care of setting those
- * values.
- *
- * We also use physical address 0x4 here to tell when a cpu
- * is in its holding pattern code.
- *
- * -- Cort
- *
- * Note that we have to do this if we have more than one CPU,
- * even if this is a UP kernel.  Otherwise when we trash OF
- * the other CPUs will start executing some random instructions
- * and crash the system.  -- paulus
- */
-static void __init
-prom_hold_cpus(unsigned long mem)
-{
-        extern void __secondary_hold(void);
-        unsigned long i;
-        int cpu;
-        phandle node;
-        char type[16], *path;
-        unsigned int reg;
-
-        /*
-         * XXX: hack to make sure we're chrp, assume that if we're
-         *      chrp we have a device_type property -- Cort
-         */
-        node = call_prom("finddevice", 1, 1, "/");
-        if (call_prom("getprop", 4, 1, node,
-                      "device_type", type, sizeof(type)) <= 0)
-                return;
-
-        /* copy the holding pattern code to someplace safe (0) */
-        /* the holding pattern is now within the first 0x100
-           bytes of the kernel image -- paulus */
-        memcpy((void *)0, _stext, 0x100);
-        flush_icache_range(0, 0x100);
-
-        /* look for cpus */
-        *(unsigned long *)(0x0) = 0;
-        asm volatile("dcbf 0,%0": : "r" (0) : "memory");
-        for (node = 0; prom_next_node(&node); ) {
-                type[0] = 0;
-                call_prom("getprop", 4, 1, node, "device_type",
-                          type, sizeof(type));
-                if (strcmp(type, "cpu") != 0)
-                        continue;
-                path = (char *) mem;
-                memset(path, 0, 256);
-                if (call_prom("package-to-path", 3, 1, node, path, 255) < 0)
-                        continue;
-                reg = -1;
-                call_prom("getprop", 4, 1, node, "reg", &reg, sizeof(reg));
-                cpu = smp_chrp_cpu_nr++;
-#ifdef CONFIG_SMP
-                smp_hw_index[cpu] = reg;
-#endif /* CONFIG_SMP */
-                /* XXX: hack - don't start cpu 0, this cpu -- Cort */
-                if (cpu == 0)
-                        continue;
-                prom_print("starting cpu ");
-                prom_print(path);
-                *(ulong *)(0x4) = 0;
-                call_prom("start-cpu", 3, 0, node,
-                          (char *)__secondary_hold - _stext, cpu);
-                prom_print("...");
-                for ( i = 0 ; (i < 10000) && (*(ulong *)(0x4) == 0); i++ )
-                        ;
-                if (*(ulong *)(0x4) == cpu)
-                        prom_print("ok\n");
-                else {
-                        prom_print("failed: ");
-                        prom_print_hex(*(ulong *)0x4);
-                        prom_print("\n");
-                }
-        }
-}
-
-static void __init
-prom_instantiate_rtas(void)
-{
-        ihandle prom_rtas;
-        prom_arg_t result;
-
-        prom_rtas = call_prom("finddevice", 1, 1, "/rtas");
-        if (prom_rtas == -1)
-                return;
-
-        rtas_size = 0;
-        call_prom("getprop", 4, 1, prom_rtas,
-                  "rtas-size", &rtas_size, sizeof(rtas_size));
-        prom_print("instantiating rtas");
-        if (rtas_size == 0) {
-                rtas_data = 0;
-        } else {
-                /*
-                 * Ask OF for some space for RTAS.
-                 * Actually OF has bugs so we just arbitrarily
-                 * use memory at the 6MB point.
-                 */
-                rtas_data = 6 << 20;
-                prom_print(" at ");
-                prom_print_hex(rtas_data);
-        }
-
-        prom_rtas = call_prom("open", 1, 1, "/rtas");
-        prom_print("...");
-        rtas_entry = 0;
-        if (call_prom_ret("call-method", 3, 2, &result,
-                          "instantiate-rtas", prom_rtas, rtas_data) == 0)
-                rtas_entry = result;
-        if ((rtas_entry == -1) || (rtas_entry == 0))
-                prom_print(" failed\n");
-        else
-                prom_print(" done\n");
-}
-
-/*
- * We enter here early on, when the Open Firmware prom is still
- * handling exceptions and the MMU hash table for us.
- */
-unsigned long __init
-prom_init(int r3, int r4, prom_entry pp)
-{
-        unsigned long mem;
-        ihandle prom_mmu;
-        unsigned long offset = reloc_offset();
-        int i, l;
-        char *p, *d;
-        unsigned long phys;
-        prom_arg_t result[3];
-        char model[32];
-        phandle node;
-        int rc;
-
-        /* Default */
-        phys = (unsigned long) &_stext;
-
-        /* First get a handle for the stdout device */
-        prom = pp;
-        prom_chosen = call_prom("finddevice", 1, 1, "/chosen");
-        if (prom_chosen == -1)
-                prom_exit();
-        if (call_prom("getprop", 4, 1, prom_chosen, "stdout",
-                      &prom_stdout, sizeof(prom_stdout)) <= 0)
-                prom_exit();
-
-        /* Get the full OF pathname of the stdout device */
-        mem = (unsigned long) klimit + offset;
-        p = (char *) mem;
-        memset(p, 0, 256);
-        call_prom("instance-to-path", 3, 1, prom_stdout, p, 255);
-        of_stdout_device = p;
-        mem += strlen(p) + 1;
-
-        /* Get the boot device and translate it to a full OF pathname. */
-        p = (char *) mem;
-        l = call_prom("getprop", 4, 1, prom_chosen, "bootpath", p, 1<<20);
-        if (l > 0) {
-                p[l] = 0;       /* should already be null-terminated */
-                bootpath = PTRUNRELOC(p);
-                mem += l + 1;
-                d = (char *) mem;
-                *d = 0;
-                call_prom("canon", 3, 1, p, d, 1<<20);
-                bootdevice = PTRUNRELOC(d);
-                mem = ALIGNUL(mem + strlen(d) + 1);
-        }
-
-        prom_instantiate_rtas();
-
-#ifdef CONFIG_POWER4
-        /*
-         * Find out how much memory we have and allocate a
-         * suitably-sized hash table.
-         */
-        prom_alloc_htab();
-#endif
-        mem = check_display(mem);
-
-        prom_print("copying OF device tree...");
-        mem = copy_device_tree(mem, mem + (1<<20));
-        prom_print("done\n");
-
-        prom_hold_cpus(mem);
-
-        klimit = (char *) (mem - offset);
-
-        node = call_prom("finddevice", 1, 1, "/");
-        rc = call_prom("getprop", 4, 1, node, "model", model, sizeof(model));
-        if (rc > 0 && !strncmp (model, "Pegasos", 7)
-                && strncmp (model, "Pegasos2", 8)) {
-                /* Pegasos 1 has a broken translate method in the OF,
-                 * and furthermore the BATs are mapped 1:1 so the phys
-                 * address calculated above is correct, so let's use
-                 * it directly.
-                 */
-        } else if (offset == 0) {
-                /* If we are already running at 0xc0000000, we assume we were
-                 * loaded by an OF bootloader which did set a BAT for us.
-                 * This breaks OF translate so we force phys to be 0.
-                 */
-                prom_print("(already at 0xc0000000) phys=0\n");
-                phys = 0;
-        } else if (call_prom("getprop", 4, 1, prom_chosen, "mmu",
-                             &prom_mmu, sizeof(prom_mmu)) <= 0) {
-                prom_print(" no MMU found\n");
-        } else if (call_prom_ret("call-method", 4, 4, result, "translate",
-                                 prom_mmu, &_stext, 1) != 0) {
-                prom_print(" (translate failed)\n");
-        } else {
-                /* We assume the phys. address size is 3 cells */
-                phys = result[2];
-        }
-
-        if (prom_disp_node != 0)
-                setup_disp_fake_bi(prom_disp_node);
-
-        /* Use quiesce call to get OF to shut down any devices it's using */
-        prom_print("Calling quiesce ...\n");
-        call_prom("quiesce", 0, 0);
-
-        /* Relocate various pointers which will be used once the
-           kernel is running at the address it was linked at. */
-        for (i = 0; i < prom_num_displays; ++i)
-                prom_display_paths[i] = PTRUNRELOC(prom_display_paths[i]);
-
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
-        /* Relocate the of stdout for console autodetection */
-        of_stdout_device = PTRUNRELOC(of_stdout_device);
-#endif
-
-        prom_print("returning 0x");
-        prom_print_hex(phys);
-        prom_print("from prom_init\n");
-        prom_stdout = 0;
-
-        return phys;
-}
-
-/*
- * early_get_property is used to access the device tree image prepared
- * by BootX very early on, before the pointers in it have been relocated.
- */
-static void * __init
-early_get_property(unsigned long base, unsigned long node, char *prop)
-{
-        struct device_node *np = (struct device_node *)(base + node);
-        struct property *pp;
-
-        for (pp = np->properties; pp != 0; pp = pp->next) {
-                pp = (struct property *) (base + (unsigned long)pp);
-                if (strcmp((char *)((unsigned long)pp->name + base),
-                           prop) == 0) {
-                        return (void *)((unsigned long)pp->value + base);
-                }
-        }
-        return NULL;
-}
-
-/* Is boot-info compatible ? */
-#define BOOT_INFO_IS_COMPATIBLE(bi)             ((bi)->compatible_version <= BOOT_INFO_VERSION)
-#define BOOT_INFO_IS_V2_COMPATIBLE(bi)  ((bi)->version >= 2)
-#define BOOT_INFO_IS_V4_COMPATIBLE(bi)  ((bi)->version >= 4)
-
-void __init
-bootx_init(unsigned long r4, unsigned long phys)
-{
-        boot_infos_t *bi = (boot_infos_t *) r4;
-        unsigned long space;
-        unsigned long ptr, x;
-        char *model;
-
-        boot_infos = PTRUNRELOC(bi);
-        if (!BOOT_INFO_IS_V2_COMPATIBLE(bi))
-                bi->logicalDisplayBase = NULL;
-
-#ifdef CONFIG_BOOTX_TEXT
-        btext_init(bi);
-
-        /*
-         * Test if boot-info is compatible.  Done only in config
-         * CONFIG_BOOTX_TEXT since there is nothing much we can do
-         * with an incompatible version, except display a message
-         * and eventually hang the processor...
-         *
-         * I'll try to keep enough of boot-info compatible in the
-         * future to always allow display of this message;
-         */
-        if (!BOOT_INFO_IS_COMPATIBLE(bi)) {
-                btext_drawstring(" !!! WARNING - Incompatible version of BootX !!!\n\n\n");
-                btext_flushscreen();
-        }
-#endif  /* CONFIG_BOOTX_TEXT */
-
-        /* New BootX enters kernel with MMU off, i/os are not allowed
-           here. This hack will have been done by the boostrap anyway.
-        */
-        if (bi->version < 4) {
-                /*
-                 * XXX If this is an iMac, turn off the USB controller.
-                 */
-                model = (char *) early_get_property
-                        (r4 + bi->deviceTreeOffset, 4, "model");
-                if (model
-                    && (strcmp(model, "iMac,1") == 0
-                        || strcmp(model, "PowerMac1,1") == 0)) {
-                        out_le32((unsigned *)0x80880008, 1);    /* XXX */
-                }
-        }
-
-        /* Move klimit to enclose device tree, args, ramdisk, etc... */
-        if (bi->version < 5) {
-                space = bi->deviceTreeOffset + bi->deviceTreeSize;
-                if (bi->ramDisk)
-                        space = bi->ramDisk + bi->ramDiskSize;
-        } else
-                space = bi->totalParamsSize;
-        klimit = PTRUNRELOC((char *) bi + space);
-
-        /* New BootX will have flushed all TLBs and enters kernel with
-           MMU switched OFF, so this should not be useful anymore.
-        */
-        if (bi->version < 4) {
-                /*
-                 * Touch each page to make sure the PTEs for them
-                 * are in the hash table - the aim is to try to avoid
-                 * getting DSI exceptions while copying the kernel image.
-                 */
-                for (ptr = ((unsigned long) &_stext) & PAGE_MASK;
-                     ptr < (unsigned long)bi + space; ptr += PAGE_SIZE)
-                        x = *(volatile unsigned long *)ptr;
-        }
-
-#ifdef CONFIG_BOOTX_TEXT
-        /*
-         * Note that after we call btext_prepare_BAT, we can't do
-         * prom_draw*, flushscreen or clearscreen until we turn the MMU
-         * on, since btext_prepare_BAT sets disp_bi.logicalDisplayBase
-         * to a virtual address.
-         */
-        btext_prepare_BAT();
-#endif
-}
diff --git a/arch/ppc/syslib/todc_time.c b/arch/ppc/syslib/todc_time.c
index 1323c641c19d..a8168b8e5683 100644
--- a/arch/ppc/syslib/todc_time.c
+++ b/arch/ppc/syslib/todc_time.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/todc_time.c
- *
  * Time of Day Clock support for the M48T35, M48T37, M48T59, and MC146818
  * Real Time Clocks/Timekeepers.
  *
diff --git a/arch/ppc/syslib/xilinx_pic.c b/arch/ppc/syslib/xilinx_pic.c
index 47f04c71fe9c..e672b600f315 100644
--- a/arch/ppc/syslib/xilinx_pic.c
+++ b/arch/ppc/syslib/xilinx_pic.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/xilinx_pic.c
- *
  * Interrupt controller driver for Xilinx Virtex-II Pro.
  *
  * Author: MontaVista Software, Inc.
@@ -15,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <asm/io.h>
-#include <asm/xparameters.h>
+#include <platforms/4xx/xparameters/xparameters.h>
 #include <asm/ibm4xx.h>
 #include <asm/machdep.h>
 
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c
index ff86b2d814cb..cfc2d6ad464d 100644
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
@@ -58,7 +58,7 @@ static struct sysrq_key_op sysrq_xmon_op =
 void
 xmon_map_scc(void)
 {
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_PREP
         volatile unsigned char *base;
 
 #elif defined(CONFIG_GEMINI)