---

yaml
---
r: 279743
b: refs/heads/master
c: 3731454
h: refs/heads/master
i:
  279741: be717a5
  279739: da2f39f
  279735: 2d82b53
  279727: be5e7f7
  279711: 8f40cef
  279679: 5cbd587
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef6aa00dc8e6eece53ac140ecd6183d331cf3173
+refs/heads/master: 3731454033432abd37e1a6701eb0f1d73a47d680

trunk/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;
@@ -326,6 +327,11 @@ void __init setup_arch(char **cmdline_p)
 	case MACH_SUN3X:
 		config_sun3x();
 		break;
+#endif
+#ifdef CONFIG_COLDFIRE
+	case MACH_M54XX:
+		config_BSP(NULL, 0);
+		break;
 #endif
 	default:
 		panic("No configuration setup");