---

yaml --- r: 259071 b: refs/heads/master c: f4a5437 h: refs/heads/master i: 259069: f7b2ce9 259067: 59ede73 259063: 93356e6 259055: fb7b98d 259039: c698e0e 259007: 8838eee 258943: d7d5e59 258815: 588365d 258559: 4c8e681 258047: cc12fc2 v: v3
git-mirror · Jul 25, 2011 · 7ea23c9 · 7ea23c9
1 parent 019ce0c
commit 7ea23c9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 196 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 171d809df1896c1022f9778cd2788be6c255a7dc
+refs/heads/master: f4a5437333e405e967be660430e58fc2355c62c8
diff --git a/trunk/arch/m68k/Makefile_no b/trunk/arch/m68k/Makefile_no
@@ -13,7 +13,7 @@ platform-$(CONFIG_M68EZ328)	:= 68EZ328
 platform-$(CONFIG_M68VZ328)	:= 68VZ328
 platform-$(CONFIG_M68360)	:= 68360
 platform-$(CONFIG_M5206)	:= 5206
-platform-$(CONFIG_M5206e)	:= 5206e
+platform-$(CONFIG_M5206e)	:= 5206
 platform-$(CONFIG_M520x)	:= 520x
 platform-$(CONFIG_M523x)	:= 523x
 platform-$(CONFIG_M5249)	:= 5249

diff --git a/trunk/arch/m68k/platform/5206/config.c b/trunk/arch/m68k/platform/5206/config.c
@@ -98,6 +98,12 @@ void m5206_cpu_reset(void)
 
 void __init config_BSP(char *commandp, int size)
 {
+#if defined(CONFIG_NETtel)
+	/* Copy command line from FLASH to local buffer... */
+	memcpy(commandp, (char *) 0xf0004000, size);
+	commandp[size-1] = 0;
+#endif /* CONFIG_NETtel */
+
 	mach_reset = m5206_cpu_reset;
 	m5206_timers_init();
 	m5206_uarts_init();

diff --git a/trunk/arch/m68k/platform/5206e/Makefile b/trunk/arch/m68k/platform/5206e/Makefile
diff --git a/trunk/arch/m68k/platform/5206e/config.c b/trunk/arch/m68k/platform/5206e/config.c
diff --git a/trunk/arch/m68k/platform/5206e/gpio.c b/trunk/arch/m68k/platform/5206e/gpio.c