diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-04-17 15:21:31 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-05-20 21:21:58 +1000 |
| commit | daacd5cc255bdba62b1be999c7b77ca1015a79a3 (patch) | |
| tree | c7e46f5bf1e7099a511074ad1c6ad3ddaf277da3 /arch | |
| parent | f198f9cd857a1a59f94a56fa5a6fbfc437a2bc0a (diff) | |
m68knommu: move the 5206 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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/Makefile | 2 | ||||
| -rw-r--r-- | arch/m68k/platform/5206/Makefile | 18 | ||||
| -rw-r--r-- | arch/m68k/platform/coldfire/Makefile | 4 | ||||
| -rw-r--r-- | arch/m68k/platform/coldfire/m5206.c (renamed from arch/m68k/platform/5206/config.c) | 0 |
4 files changed, 2 insertions, 22 deletions
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index cf318f20c64..8303f3b1368 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -115,8 +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_M5206) += arch/m68k/platform/5206/ -core-$(CONFIG_M5206e) += arch/m68k/platform/5206/ core-$(CONFIG_M520x) += arch/m68k/platform/520x/ core-$(CONFIG_M523x) += arch/m68k/platform/523x/ core-$(CONFIG_M5249) += arch/m68k/platform/5249/ diff --git a/arch/m68k/platform/5206/Makefile b/arch/m68k/platform/5206/Makefile deleted file mode 100644 index 8a34a9d443e..00000000000 --- a/arch/m68k/platform/5206/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 a0815c61dec..ef729b173eb 100644 --- a/arch/m68k/platform/coldfire/Makefile +++ b/arch/m68k/platform/coldfire/Makefile @@ -15,8 +15,8 @@ asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1 obj-$(CONFIG_COLDFIRE) += cache.o clk.o device.o dma.o entry.o vectors.o -obj-$(CONFIG_M5206) += timers.o intc.o reset.o -obj-$(CONFIG_M5206e) += timers.o intc.o reset.o +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) += pit.o intc-simr.o reset.o obj-$(CONFIG_M523x) += pit.o dma_timer.o intc-2.o reset.o obj-$(CONFIG_M5249) += timers.o intc.o reset.o diff --git a/arch/m68k/platform/5206/config.c b/arch/m68k/platform/coldfire/m5206.c index a8b81df653f..a8b81df653f 100644 --- a/arch/m68k/platform/5206/config.c +++ b/arch/m68k/platform/coldfire/m5206.c |