diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-04-17 15:36:11 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-05-20 21:22:04 +1000 |
| commit | 136f148f61fb7d53f104abcf827a90bf8fa6c8f7 (patch) | |
| tree | b4e00c62ebcafdfa700ed0695146fa3e5ff7495b | |
| parent | 76148ab8b79e0b40107a96f97e7fd7a0f1f732a1 (diff) | |
| download | linux-136f148f61fb7d53f104abcf827a90bf8fa6c8f7.tar.bz2 | |
m68knommu: move the 5307 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>
| -rw-r--r-- | arch/m68k/Makefile | 1 | ||||
| -rw-r--r-- | arch/m68k/platform/5307/Makefile | 20 | ||||
| -rw-r--r-- | arch/m68k/platform/coldfire/Makefile | 5 | ||||
| -rw-r--r-- | arch/m68k/platform/coldfire/m5307.c (renamed from arch/m68k/platform/5307/config.c) | 0 | ||||
| -rw-r--r-- | arch/m68k/platform/coldfire/nettel.c (renamed from arch/m68k/platform/5307/nettel.c) | 0 |
5 files changed, 4 insertions, 22 deletions
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 65f5844225cf..02626a32c15f 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_M5307) += arch/m68k/platform/5307/ 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/5307/Makefile b/arch/m68k/platform/5307/Makefile deleted file mode 100644 index fd08186a173a..000000000000 --- a/arch/m68k/platform/5307/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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: -# -# ccflags-y := -DTRAP_DBG_INTERRUPT -# asflags-y := -DTRAP_DBG_INTERRUPT -# - -asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1 - -obj-y += config.o -obj-$(CONFIG_NETtel) += nettel.o -obj-$(CONFIG_CLEOPATRA) += nettel.o - diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile index cdd884e49f43..bfe71e0be215 100644 --- a/arch/m68k/platform/coldfire/Makefile +++ b/arch/m68k/platform/coldfire/Makefile @@ -23,10 +23,13 @@ obj-$(CONFIG_M5249) += m5249.o timers.o intc.o intc-5249.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) += m528x.o pit.o intc-2.o reset.o -obj-$(CONFIG_M5307) += timers.o intc.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_M54xx) += sltimers.o intc-2.o +obj-$(CONFIG_NETtel) += nettel.o +obj-$(CONFIG_CLEOPATRA) += nettel.o + obj-y += pinmux.o gpio.o extra-y := head.o diff --git a/arch/m68k/platform/5307/config.c b/arch/m68k/platform/coldfire/m5307.c index 93b484976ab3..93b484976ab3 100644 --- a/arch/m68k/platform/5307/config.c +++ b/arch/m68k/platform/coldfire/m5307.c diff --git a/arch/m68k/platform/5307/nettel.c b/arch/m68k/platform/coldfire/nettel.c index e925ea4602f8..e925ea4602f8 100644 --- a/arch/m68k/platform/5307/nettel.c +++ b/arch/m68k/platform/coldfire/nettel.c |