From: Greg Ungerer <g...@uclinux.org>

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 <g...@uclinux.org>
---
 arch/m68k/Makefile                                 |    1 -
 arch/m68k/platform/527x/Makefile                   |   18 ------------------
 arch/m68k/platform/coldfire/Makefile               |    2 +-
 .../platform/{527x/config.c => coldfire/m527x.c}   |    0
 4 files changed, 1 insertions(+), 20 deletions(-)
 delete mode 100644 arch/m68k/platform/527x/Makefile
 rename arch/m68k/platform/{527x/config.c => coldfire/m527x.c} (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 2d7a4d9..7e138d6 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_M527x)           += arch/m68k/platform/527x/
 core-$(CONFIG_M528x)           += arch/m68k/platform/528x/
 core-$(CONFIG_M5307)           += arch/m68k/platform/5307/
 core-$(CONFIG_M532x)           += arch/m68k/platform/532x/
diff --git a/arch/m68k/platform/527x/Makefile b/arch/m68k/platform/527x/Makefile
deleted file mode 100644
index 8755c9e..0000000
--- a/arch/m68k/platform/527x/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Makefile for the 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 ec81d05..8bef346 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -20,7 +20,7 @@ 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)    += m5249.o timers.o intc.o intc-5249.o reset.o
-obj-$(CONFIG_M527x)    += pit.o intc-2.o reset.o
+obj-$(CONFIG_M527x)    += m527x.o pit.o intc-2.o reset.o
 obj-$(CONFIG_M5272)    += m5272.o intc-5272.o timers.o
 obj-$(CONFIG_M528x)    += pit.o intc-2.o reset.o
 obj-$(CONFIG_M5307)    += timers.o intc.o reset.o
diff --git a/arch/m68k/platform/527x/config.c 
b/arch/m68k/platform/coldfire/m527x.c
similarity index 100%
rename from arch/m68k/platform/527x/config.c
rename to arch/m68k/platform/coldfire/m527x.c
-- 
1.7.0.4

_______________________________________________
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

Reply via email to