85xx: Fix merge duplication

ft_fixup_cpu() got duplicated in some merge snafu.  Remove the duplicate.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/cpu/mpc85xx/fdt.c b/cpu/mpc85xx/fdt.c
index dadda90da7c98910770d765624ab75ea9e461124..43df1c70b2b282958bab41c49fe34e7d6eb1f9b1 100644 (file)
--- a/cpu/mpc85xx/fdt.c
+++ b/cpu/mpc85xx/fdt.c
@@ -77,55 +77,6 @@ void ft_fixup_cpu(void *blob, u64 memory_limit)
 }
 #endif
 
-#ifdef CONFIG_MP
-#include "mp.h"
-DECLARE_GLOBAL_DATA_PTR;
-
-void ft_fixup_cpu(void *blob, u64 memory_limit)
-{
-       int off;
-       ulong spin_tbl_addr = get_spin_addr();
-       u32 bootpg, id = get_my_id();
-
-       /* if we have 4G or more of memory, put the boot page at 4Gb-4k */
-       if ((u64)gd->ram_size > 0xfffff000)
-               bootpg = 0xfffff000;
-       else
-               bootpg = gd->ram_size - 4096;
-
-       off = fdt_node_offset_by_prop_value(blob, -1, "device_type", "cpu", 4);
-       while (off != -FDT_ERR_NOTFOUND) {
-               u32 *reg = (u32 *)fdt_getprop(blob, off, "reg", 0);
-
-               if (reg) {
-                       if (*reg == id) {
-                               fdt_setprop_string(blob, off, "status", "okay");
-                       } else {
-                               u32 val = *reg * 24 + spin_tbl_addr;
-                               val = cpu_to_fdt32(val);
-                               fdt_setprop_string(blob, off, "status",
-                                                               "disabled");
-                               fdt_setprop_string(blob, off, "enable-method",
-                                                               "spin-table");
-                               fdt_setprop(blob, off, "cpu-release-addr",
-                                               &val, sizeof(val));
-                       }
-               } else {
-                       printf ("cpu NULL\n");
-               }
-               off = fdt_node_offset_by_prop_value(blob, off,
-                               "device_type", "cpu", 4);
-       }
-
-       /* Reserve the boot page so OSes dont use it */
-       if ((u64)bootpg < memory_limit) {
-               off = fdt_add_mem_rsv(blob, bootpg, (u64)4096);
-               if (off < 0)
-                       printf("%s: %s\n", __FUNCTION__, fdt_strerror(off));
-       }
-}
-#endif
-
 void ft_cpu_setup(void *blob, bd_t *bd)
 {
 #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\