m68knommu: move the 5249 platform code into the common ColdFire code directory

All these separate directories for each ColdFire CPU SoC varient seems like
overkill. The majority of them only contain a single small config file. Move
these into the common ColdFire code directory.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

5 files changed, 1 insertions, 20 deletions

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 922a7ddcd8f5..314c10c7bfd1 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -115,7 +115,6 @@ core-$(CONFIG_M68000)		+= arch/m68k/platform/68328/
 core-$(CONFIG_M68EZ328)         += arch/m68k/platform/68EZ328/
 core-$(CONFIG_M68VZ328)         += arch/m68k/platform/68VZ328/
 core-$(CONFIG_COLDFIRE)         += arch/m68k/platform/coldfire/
-core-$(CONFIG_M5249)            += arch/m68k/platform/5249/
 core-$(CONFIG_M527x)            += arch/m68k/platform/527x/
 core-$(CONFIG_M5272)            += arch/m68k/platform/5272/
 core-$(CONFIG_M528x)            += arch/m68k/platform/528x/
diff --git a/arch/m68k/platform/5249/Makefile b/arch/m68k/platform/5249/Makefile
deleted file mode 100644
index 8a0186bce829..000000000000
--- a/arch/m68k/platform/5249/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Makefile for the m68knommu linux kernel.
-#
-
-#
-# If you want to play with the HW breakpoints then you will
-# need to add define this,  which will give you a stack backtrace
-# on the console port whenever a DBG interrupt occurs.  You have to
-# set up you HW breakpoints to trigger a DBG interrupt:
-#
-# ccflags-y := -DTRAP_DBG_INTERRUPT
-# asflags-y := -DTRAP_DBG_INTERRUPT
-#
-
-asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
-
-obj-y := config.o intc2.o
-
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index 50a3aefde30b..87ffd2ce374c 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -19,7 +19,7 @@ obj-$(CONFIG_M5206)	+= m5206.o timers.o intc.o reset.o
 obj-$(CONFIG_M5206e)    += m5206.o timers.o intc.o reset.o
 obj-$(CONFIG_M520x)     += m520x.o pit.o intc-simr.o reset.o
 obj-$(CONFIG_M523x)     += m523x.o pit.o dma_timer.o intc-2.o reset.o
-obj-$(CONFIG_M5249)     += timers.o intc.o reset.o
+obj-$(CONFIG_M5249)     += m5249.o timers.o intc.o intc-5249.o reset.o
 obj-$(CONFIG_M527x)     += pit.o intc-2.o reset.o
 obj-$(CONFIG_M5272)     += timers.o
 obj-$(CONFIG_M528x)     += pit.o intc-2.o reset.o
diff --git a/arch/m68k/platform/5249/intc2.c b/arch/m68k/platform/coldfire/intc-5249.c
index f343bf7bf5b0..f343bf7bf5b0 100644
--- a/arch/m68k/platform/5249/intc2.c
+++ b/arch/m68k/platform/coldfire/intc-5249.c
diff --git a/arch/m68k/platform/5249/config.c b/arch/m68k/platform/coldfire/m5249.c
index fdfa1edfd1ac..fdfa1edfd1ac 100644
--- a/arch/m68k/platform/5249/config.c
+++ b/arch/m68k/platform/coldfire/m5249.c