From 95e95d641ca4be098f9b1aab28ea7b554e94c948 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 17 Apr 2012 15:35:01 +1000 Subject: [PATCH] --- yaml --- r: 302675 b: refs/heads/master c: 76148ab8b79e0b40107a96f97e7fd7a0f1f732a1 h: refs/heads/master i: 302673: 44210a820c29088e98b1db671e34df5d249f0b32 302671: 115eb089f2da37e43d6085320fb083a1fe2db1a0 v: v3 --- [refs] | 2 +- trunk/arch/m68k/Makefile | 1 - trunk/arch/m68k/platform/528x/Makefile | 18 ------------------ trunk/arch/m68k/platform/coldfire/Makefile | 2 +- .../{528x/config.c => coldfire/m528x.c} | 0 5 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 trunk/arch/m68k/platform/528x/Makefile rename trunk/arch/m68k/platform/{528x/config.c => coldfire/m528x.c} (100%) diff --git a/[refs] b/[refs] index 203d5270d1fe..139b011c2dc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60fb32ca61390360f2cce750ad2715b80e629027 +refs/heads/master: 76148ab8b79e0b40107a96f97e7fd7a0f1f732a1 diff --git a/trunk/arch/m68k/Makefile b/trunk/arch/m68k/Makefile index 7e138d61e297..65f5844225cf 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_M528x) += arch/m68k/platform/528x/ core-$(CONFIG_M5307) += arch/m68k/platform/5307/ core-$(CONFIG_M532x) += arch/m68k/platform/532x/ core-$(CONFIG_M5407) += arch/m68k/platform/5407/ diff --git a/trunk/arch/m68k/platform/528x/Makefile b/trunk/arch/m68k/platform/528x/Makefile deleted file mode 100644 index 8755c9e6c66b..000000000000 --- a/trunk/arch/m68k/platform/528x/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/trunk/arch/m68k/platform/coldfire/Makefile b/trunk/arch/m68k/platform/coldfire/Makefile index 8bef3463de21..cdd884e49f43 100644 --- a/trunk/arch/m68k/platform/coldfire/Makefile +++ b/trunk/arch/m68k/platform/coldfire/Makefile @@ -22,7 +22,7 @@ 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) += 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_M528x) += m528x.o pit.o intc-2.o reset.o obj-$(CONFIG_M5307) += 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 diff --git a/trunk/arch/m68k/platform/528x/config.c b/trunk/arch/m68k/platform/coldfire/m528x.c similarity index 100% rename from trunk/arch/m68k/platform/528x/config.c rename to trunk/arch/m68k/platform/coldfire/m528x.c