m68knommu: modify Makefiles to support common coldfire directory

Modify Makefiles to support separate coldfire platform directory.

Currently the common ColdFire CPU family code sits in the
arch/m68knommu/platform/5307 directory. This is confusing, the files
containing this common code are in no way specific to the 5307 ColdFire.
Create an arch/m68knommu/platform/coldfire directory to contain this
common code. Other m68knommu CPU varients do not need use this code
though, so it doesn't make sense to move it to arch/m68knommu/kernel.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index 30aa2553693d116702684f904a262016b1472ca4..e0b5f62e395caff7ee475a660482e2cdd8b24883 100644 (file)
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -61,17 +61,17 @@ MODEL := $(model-y)
 # for the selected cpu. ONLY need to define this for the non-base member
 # of the family.
 #
-cpuclass-$(CONFIG_M5206)       := 5307
-cpuclass-$(CONFIG_M5206e)      := 5307
-cpuclass-$(CONFIG_M520x)       := 5307
-cpuclass-$(CONFIG_M523x)       := 5307
-cpuclass-$(CONFIG_M5249)       := 5307
-cpuclass-$(CONFIG_M527x)       := 5307
-cpuclass-$(CONFIG_M5272)       := 5307
-cpuclass-$(CONFIG_M528x)       := 5307
-cpuclass-$(CONFIG_M5307)       := 5307
-cpuclass-$(CONFIG_M532x)       := 5307
-cpuclass-$(CONFIG_M5407)       := 5307
+cpuclass-$(CONFIG_M5206)       := coldfire
+cpuclass-$(CONFIG_M5206e)      := coldfire
+cpuclass-$(CONFIG_M520x)       := coldfire
+cpuclass-$(CONFIG_M523x)       := coldfire
+cpuclass-$(CONFIG_M5249)       := coldfire
+cpuclass-$(CONFIG_M527x)       := coldfire
+cpuclass-$(CONFIG_M5272)       := coldfire
+cpuclass-$(CONFIG_M528x)       := coldfire
+cpuclass-$(CONFIG_M5307)       := coldfire
+cpuclass-$(CONFIG_M532x)       := coldfire
+cpuclass-$(CONFIG_M5407)       := coldfire
 cpuclass-$(CONFIG_M68328)      := 68328
 cpuclass-$(CONFIG_M68EZ328)    := 68328
 cpuclass-$(CONFIG_M68VZ328)    := 68328

diff --git a/arch/m68knommu/platform/5307/Makefile b/arch/m68knommu/platform/5307/Makefile
index 5b600530c8d2400a798c44bbf05ddd8135690bb0..580fd6658d7c204a1f86baff20ef0ba39b08b220 100644 (file)
--- a/arch/m68knommu/platform/5307/Makefile
+++ b/arch/m68knommu/platform/5307/Makefile
@@ -16,17 +16,5 @@ ifdef CONFIG_FULLDEBUG
 EXTRA_AFLAGS += -DDEBUGGER_COMPATIBLE_CACHE=1
 endif
 
-obj-$(CONFIG_COLDFIRE) += entry.o vectors.o
-obj-$(CONFIG_M5206)    += timers.o
-obj-$(CONFIG_M5206e)   += timers.o
-obj-$(CONFIG_M520x)    += pit.o
-obj-$(CONFIG_M523x)    += pit.o
-obj-$(CONFIG_M5249)    += timers.o
-obj-$(CONFIG_M527x)     += pit.o
-obj-$(CONFIG_M5272)    += timers.o
-obj-$(CONFIG_M5307)    += config.o timers.o
-obj-$(CONFIG_M532x)    += timers.o
-obj-$(CONFIG_M528x)     += pit.o
-obj-$(CONFIG_M5407)    += timers.o
+obj-y  += config.o
 
-extra-y := head.o

diff --git a/arch/m68knommu/platform/coldfire/Makefile b/arch/m68knommu/platform/coldfire/Makefile
new file mode 100644 (file)
index 0000000..e5fff29
--- /dev/null
+++ b/arch/m68knommu/platform/coldfire/Makefile
@@ -0,0 +1,32 @@
+#
+# Makefile for the m68knommu 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:
+#
+# EXTRA_CFLAGS += -DTRAP_DBG_INTERRUPT
+# EXTRA_AFLAGS += -DTRAP_DBG_INTERRUPT
+#
+
+ifdef CONFIG_FULLDEBUG
+AFLAGS += -DDEBUGGER_COMPATIBLE_CACHE=1
+endif
+
+obj-$(CONFIG_COLDFIRE) += dma.o entry.o vectors.o
+obj-$(CONFIG_M5206)    += timers.o
+obj-$(CONFIG_M5206e)   += timers.o
+obj-$(CONFIG_M520x)    += pit.o
+obj-$(CONFIG_M523x)    += pit.o
+obj-$(CONFIG_M5249)    += timers.o
+obj-$(CONFIG_M527x)    += pit.o
+obj-$(CONFIG_M5272)    += timers.o
+obj-$(CONFIG_M528x)    += pit.o
+obj-$(CONFIG_M5307)    += timers.o
+obj-$(CONFIG_M532x)    += timers.o
+obj-$(CONFIG_M5407)    += timers.o
+
+extra-y := head.o