summaryrefslogtreecommitdiffstats
path: root/arch/m68k/platform/5206
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-06-06 13:33:11 +1000
committerGreg Ungerer <gerg@uclinux.org>2011-07-25 11:20:41 +1000
commitf4a5437333e405e967be660430e58fc2355c62c8 (patch)
treedb21f0961dc64ccbb91525b9f507a97b977d9ab9 /arch/m68k/platform/5206
parent171d809df1896c1022f9778cd2788be6c255a7dc (diff)
downloadop-kernel-dev-f4a5437333e405e967be660430e58fc2355c62c8.zip
op-kernel-dev-f4a5437333e405e967be660430e58fc2355c62c8.tar.gz
m68knommu: merge ColdFire 5206 and 5206e platform code
The ColdFire 5206 and 5206e CPU families are almost identical, we can easily merge the platform support code for them. All the differences are dealt with in the current include/asm/5206sim.h. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/platform/5206')
-rw-r--r--arch/m68k/platform/5206/config.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/m68k/platform/5206/config.c b/arch/m68k/platform/5206/config.c
index 9c33546..6fa3f80 100644
--- a/arch/m68k/platform/5206/config.c
+++ b/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();
OpenPOWER on IntegriCloud