[PATCH] ppc: Remove powermac support from ARCH=ppc

This makes it possible to build kernels for PReP and/or CHRP
with ARCH=ppc by removing the (non-building) powermac support.
It's now also possible to select PReP and CHRP independently.
Powermac users should now build with ARCH=powerpc instead of
ARCH=ppc.  (This does mean that it is no longer possible to
build a 32-bit kernel for a G5.)

Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 2 insertions, 21 deletions

diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
index 84ef03018d0e..159dcd92a6d1 100644
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
@@ -39,8 +39,6 @@ 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_PMAC)          += open_pic.o
-obj-$(CONFIG_POWER4)            += open_pic2.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
diff --git a/arch/ppc/syslib/prom.c b/arch/ppc/syslib/prom.c
index af4deace49e0..482f837fd373 100644
--- a/arch/ppc/syslib/prom.c
+++ b/arch/ppc/syslib/prom.c
@@ -70,8 +70,6 @@ int use_of_interrupt_tree;
 struct device_node *dflt_interrupt_controller;
 int num_interrupt_controllers;
 
-int pmac_newworld;
-
 extern unsigned int rtas_entry;  /* physical pointer */
 
 extern struct device_node *allnodes;
@@ -123,22 +121,13 @@ finish_device_tree(void)
         unsigned long mem = (unsigned long) klimit;
         struct device_node *np;
 
-        /* All newworld pmac machines and CHRPs now use the interrupt tree */
+        /* 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 (_machine == _MACH_Pmac && use_of_interrupt_tree)
-                pmac_newworld = 1;
-
-#ifdef CONFIG_BOOTX_TEXT
-        if (boot_infos && pmac_newworld) {
-                prom_print("WARNING ! BootX/miBoot booting is not supported on this machine\n");
-                prom_print("          You should use an Open Firmware bootloader\n");
-        }
-#endif /* CONFIG_BOOTX_TEXT */
 
         if (use_of_interrupt_tree) {
                 /*
@@ -434,16 +423,10 @@ finish_node_interrupts(struct device_node *np, unsigned long mem_start)
                  * those machines, we want to offset interrupts from the
                  * second openpic by 128 -- BenH
                  */
-                if (_machine != _MACH_Pmac && num_interrupt_controllers > 1
+                if (num_interrupt_controllers > 1
                     && ic != NULL
                     && get_property(ic, "interrupt-parent", NULL) == NULL)
                         offset = 16;
-                else if (_machine == _MACH_Pmac && num_interrupt_controllers > 1
-                         && ic != NULL && ic->parent != NULL) {
-                        char *name = get_property(ic->parent, "name", NULL);
-                        if (name && !strcmp(name, "u3"))
-                                offset = 128;
-                }
 
                 np->intrs[i].line = irq[0] + offset;
                 if (n > 1)