1 files changed, 7 insertions, 1 deletions

diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 52e17d1e6138..b3938adeabea 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -221,7 +221,8 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
         /* The bootinfo is located right after the kernel bss */
-        m68k_parse_bootinfo((const struct bi_record *)_end);
+        if (!CPU_IS_COLDFIRE)
+                m68k_parse_bootinfo((const struct bi_record *)_end);
 
         if (CPU_IS_040)
                 m68k_is040or060 = 4;
@@ -327,6 +328,11 @@ void __init setup_arch(char **cmdline_p)
                 config_sun3x();
                 break;
 #endif
+#ifdef CONFIG_COLDFIRE
+        case MACH_M54XX:
+                config_BSP(NULL, 0);
+                break;
+#endif
         default:
                 panic("No configuration setup");
         }