m68knommu: move the 5407 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>

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 02626a32c15f45e9d6f848f6c6d69eb84bf36253..333c0c2e0cd746d2b23250af287e1714fb575716 100644 (file)
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -116,7 +116,6 @@ core-$(CONFIG_M68EZ328)             += arch/m68k/platform/68EZ328/
 core-$(CONFIG_M68VZ328)                += arch/m68k/platform/68VZ328/
 core-$(CONFIG_COLDFIRE)                += arch/m68k/platform/coldfire/
 core-$(CONFIG_M532x)           += arch/m68k/platform/532x/
-core-$(CONFIG_M5407)           += arch/m68k/platform/5407/
 core-$(CONFIG_M54xx)           += arch/m68k/platform/54xx/
 
 

diff --git a/arch/m68k/platform/5407/Makefile b/arch/m68k/platform/5407/Makefile
deleted file mode 100644 (file)
index 24f3cd7..0000000
--- a/arch/m68k/platform/5407/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
-

diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index bfe71e0be215e466747abc97dd66584e1e36c9cf..48dcd066f1630eadeb17f5e06bde24a76b2345fd 100644 (file)
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_M5272)   += m5272.o intc-5272.o timers.o
 obj-$(CONFIG_M528x)    += m528x.o pit.o intc-2.o reset.o
 obj-$(CONFIG_M5307)    += m5307.o timers.o intc.o reset.o
 obj-$(CONFIG_M532x)    += timers.o intc-simr.o reset.o
-obj-$(CONFIG_M5407)    += timers.o intc.o reset.o
+obj-$(CONFIG_M5407)    += m5407.o timers.o intc.o reset.o
 obj-$(CONFIG_M54xx)    += sltimers.o intc-2.o
 
 obj-$(CONFIG_NETtel)   += nettel.o

diff --git a/arch/m68k/platform/5407/config.c b/arch/m68k/platform/coldfire/m5407.c
similarity index 100%
rename from arch/m68k/platform/5407/config.c
rename to arch/m68k/platform/coldfire/m5407.c