Skip to content

Commit

Permalink
m68knommu: merge ColdFire 5206 and 5206e platform code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Ungerer committed Jul 25, 2011
1 parent 171d809 commit f4a5437
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 195 deletions.
2 changes: 1 addition & 1 deletion arch/m68k/Makefile_no
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions arch/m68k/platform/5206/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
18 changes: 0 additions & 18 deletions arch/m68k/platform/5206e/Makefile

This file was deleted.

127 changes: 0 additions & 127 deletions arch/m68k/platform/5206e/config.c

This file was deleted.

49 changes: 0 additions & 49 deletions arch/m68k/platform/5206e/gpio.c

This file was deleted.

0 comments on commit f4a5437

Please sign in to comment.