]> git.karo-electronics.de Git - karo-tx-linux.git/commit
m68knommu: merge ColdFire 5249 and 525x definitions
authorGreg Ungerer <gerg@uclinux.org>
Wed, 19 Sep 2012 03:52:12 +0000 (13:52 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Mon, 29 Oct 2012 05:58:40 +0000 (15:58 +1000)
commit6762976c423586a47f6e2614481a0b69457c99c0
treefa258cc4e70a1b773d66b59d7753e5b411fbd4d5
parentb8e9e98cb535a750ff894bda0c4754897905c315
m68knommu: merge ColdFire 5249 and 525x definitions

The ColdFire 5249 and 525x family of SoCs are very similar. Most of the
internals are the same, and are mapped the same. We can use a single set of
peripheral definitions for all of them.

So merge the current m5249sim.h and m525xsim.h definitions into a single
file. The 5249 is now obsolete, and the 525x parts are current, so I have
chosen to move everything into the existing m525xsim.h file.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
arch/m68k/include/asm/m5249sim.h [deleted file]
arch/m68k/include/asm/m525xsim.h
arch/m68k/include/asm/mcfsim.h
arch/m68k/platform/coldfire/intc-5249.c
arch/m68k/platform/coldfire/m5249.c