From 2333edebaa8eaf3a8c6b8077061fd3396212d95b Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Wed, 19 Oct 2011 11:50:34 +1000
Subject: [PATCH] --- yaml --- r: 279743 b: refs/heads/master c:
 3731454033432abd37e1a6701eb0f1d73a47d680 h: refs/heads/master i:   279741:
 be717a5ee76aae68ae506ed555b13073120aee79   279739:
 da2f39f886e6c35771cdd3c71756933705da4828   279735:
 2d82b53ca2b0eab128cd1ba866dfdd213bef886f   279727:
 be5e7f757420e340316f0a882bc029ee696d0baa   279711:
 8f40cefd3585f15e9b6e54305bb7ad22a23aad7a   279679:
 5cbd5879b826933dfe2e6183b47cf1659004d48c v: v3

---
 [refs]                            | 2 +-
 trunk/arch/m68k/kernel/setup_mm.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 24dae44c5eca..5580c3e8b9d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef6aa00dc8e6eece53ac140ecd6183d331cf3173
+refs/heads/master: 3731454033432abd37e1a6701eb0f1d73a47d680
diff --git a/trunk/arch/m68k/kernel/setup_mm.c b/trunk/arch/m68k/kernel/setup_mm.c
index 52e17d1e6138..b3938adeabea 100644
--- a/trunk/arch/m68k/kernel/setup_mm.c
+++ b/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");