4 files changed, 3 insertions, 62 deletions

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index f39c953d5353..1b725c6eaa35 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -56,6 +56,7 @@ config MAKALU
         select 405EX
         select PCI
         select PPC4xx_PCI_EXPRESS
+        select PPC40x_SIMPLE
         help
           This option enables support for the AMCC PPC405EX board.
 
diff --git a/arch/powerpc/platforms/40x/Makefile b/arch/powerpc/platforms/40x/Makefile
index 9bab76a652a6..77d4b20b64aa 100644
--- a/arch/powerpc/platforms/40x/Makefile
+++ b/arch/powerpc/platforms/40x/Makefile
@@ -1,6 +1,5 @@
 obj-$(CONFIG_KILAUEA)                           += kilauea.o
 obj-$(CONFIG_HCU4)                              += hcu4.o
-obj-$(CONFIG_MAKALU)                            += makalu.o
 obj-$(CONFIG_WALNUT)                            += walnut.o
 obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)       += virtex.o
 obj-$(CONFIG_EP405)                             += ep405.o
diff --git a/arch/powerpc/platforms/40x/makalu.c b/arch/powerpc/platforms/40x/makalu.c
deleted file mode 100644
index a6a1d6017b71..000000000000
--- a/arch/powerpc/platforms/40x/makalu.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Makalu board specific routines
- *
- * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>
- *
- * Based on the Walnut code by
- * Josh Boyer <jwboyer@linux.vnet.ibm.com>
- * Copyright 2007 IBM Corporation
- *
- * 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/of_platform.h>
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/time.h>
-#include <asm/uic.h>
-#include <asm/pci-bridge.h>
-#include <asm/ppc4xx.h>
-
-static __initdata struct of_device_id makalu_of_bus[] = {
-        { .compatible = "ibm,plb4", },
-        { .compatible = "ibm,opb", },
-        { .compatible = "ibm,ebc", },
-        {},
-};
-
-static int __init makalu_device_probe(void)
-{
-        of_platform_bus_probe(NULL, makalu_of_bus, NULL);
-
-        return 0;
-}
-machine_device_initcall(makalu, makalu_device_probe);
-
-static int __init makalu_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-
-        if (!of_flat_dt_is_compatible(root, "amcc,makalu"))
-                return 0;
-
-        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
-
-        return 1;
-}
-
-define_machine(makalu) {
-        .name                           = "Makalu",
-        .probe                          = makalu_probe,
-        .progress                       = udbg_progress,
-        .init_IRQ                       = uic_init_tree,
-        .get_irq                        = uic_get_irq,
-        .restart                        = ppc4xx_reset_system,
-        .calibrate_decr                 = generic_calibrate_decr,
-};
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
index f40ac9b8f99f..0e8aa2fe695f 100644
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -51,7 +51,8 @@ machine_device_initcall(ppc40x_simple, ppc40x_device_probe);
  * board.c file for it rather than adding it to this list.
  */
 static char *board[] __initdata = {
-        "amcc,acadia"
+        "amcc,acadia",
+        "amcc,makalu"
 };
 
 static int __init ppc40x_probe(void)