From f094b1f726257cf2d23bb85ec18da778a5a96acf Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 17 Apr 2012 15:36:11 +1000 Subject: [PATCH] --- yaml --- r: 302676 b: refs/heads/master c: 136f148f61fb7d53f104abcf827a90bf8fa6c8f7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/Makefile | 1 - trunk/arch/m68k/platform/5307/Makefile | 20 ------------------- trunk/arch/m68k/platform/coldfire/Makefile | 5 ++++- .../{5307/config.c => coldfire/m5307.c} | 0 .../m68k/platform/{5307 => coldfire}/nettel.c | 0 6 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 trunk/arch/m68k/platform/5307/Makefile rename trunk/arch/m68k/platform/{5307/config.c => coldfire/m5307.c} (100%) rename trunk/arch/m68k/platform/{5307 => coldfire}/nettel.c (100%) diff --git a/[refs] b/[refs] index 139b011c2dc7..2c1997d80a55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76148ab8b79e0b40107a96f97e7fd7a0f1f732a1 +refs/heads/master: 136f148f61fb7d53f104abcf827a90bf8fa6c8f7 diff --git a/trunk/arch/m68k/Makefile b/trunk/arch/m68k/Makefile index 65f5844225cf..02626a32c15f 100644 --- a/trunk/arch/m68k/Makefile +++ b/trunk/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/trunk/arch/m68k/platform/5307/Makefile b/trunk/arch/m68k/platform/5307/Makefile deleted file mode 100644 index fd08186a173a..000000000000 --- a/trunk/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/trunk/arch/m68k/platform/coldfire/Makefile b/trunk/arch/m68k/platform/coldfire/Makefile index cdd884e49f43..bfe71e0be215 100644 --- a/trunk/arch/m68k/platform/coldfire/Makefile +++ b/trunk/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/trunk/arch/m68k/platform/5307/config.c b/trunk/arch/m68k/platform/coldfire/m5307.c similarity index 100% rename from trunk/arch/m68k/platform/5307/config.c rename to trunk/arch/m68k/platform/coldfire/m5307.c diff --git a/trunk/arch/m68k/platform/5307/nettel.c b/trunk/arch/m68k/platform/coldfire/nettel.c similarity index 100% rename from trunk/arch/m68k/platform/5307/nettel.c rename to trunk/arch/m68k/platform/coldfire/nettel.c