From 115eb089f2da37e43d6085320fb083a1fe2db1a0 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 17 Apr 2012 15:29:34 +1000 Subject: [PATCH] --- yaml --- r: 302671 b: refs/heads/master c: 4bf648fa98f44c29c1cc2d1846455e07e858a330 h: refs/heads/master i: 302669: 27be21b18a2b6b701216e529323826bb677d10c5 302667: 69bb3b3718d949d7e791a751589ac3e8ccf560c3 302663: bb8a0e9f69577058d95904a486e8dba4eb1a86ad 302655: c25874a94030bd56e084d419d54b71fcf3ba30d5 v: v3 --- [refs] | 2 +- trunk/arch/m68k/Makefile | 1 - trunk/arch/m68k/platform/523x/Makefile | 17 ----------------- trunk/arch/m68k/platform/coldfire/Makefile | 2 +- .../{523x/config.c => coldfire/m523x.c} | 0 5 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 trunk/arch/m68k/platform/523x/Makefile rename trunk/arch/m68k/platform/{523x/config.c => coldfire/m523x.c} (100%) diff --git a/[refs] b/[refs] index 38338f65a0f7..701665aa95ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a654730ec1cd5b4bc170e7ae7ee358f2a7a554c2 +refs/heads/master: 4bf648fa98f44c29c1cc2d1846455e07e858a330 diff --git a/trunk/arch/m68k/Makefile b/trunk/arch/m68k/Makefile index 090707af5a17..922a7ddcd8f5 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_M523x) += arch/m68k/platform/523x/ core-$(CONFIG_M5249) += arch/m68k/platform/5249/ core-$(CONFIG_M527x) += arch/m68k/platform/527x/ core-$(CONFIG_M5272) += arch/m68k/platform/5272/ diff --git a/trunk/arch/m68k/platform/523x/Makefile b/trunk/arch/m68k/platform/523x/Makefile deleted file mode 100644 index e74be6926385..000000000000 --- a/trunk/arch/m68k/platform/523x/Makefile +++ /dev/null @@ -1,17 +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/trunk/arch/m68k/platform/coldfire/Makefile b/trunk/arch/m68k/platform/coldfire/Makefile index 60c1efade41e..50a3aefde30b 100644 --- a/trunk/arch/m68k/platform/coldfire/Makefile +++ b/trunk/arch/m68k/platform/coldfire/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_COLDFIRE) += cache.o clk.o device.o dma.o entry.o vectors.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) += m520x.o pit.o intc-simr.o reset.o -obj-$(CONFIG_M523x) += pit.o dma_timer.o intc-2.o reset.o +obj-$(CONFIG_M523x) += m523x.o pit.o dma_timer.o intc-2.o reset.o obj-$(CONFIG_M5249) += timers.o intc.o reset.o obj-$(CONFIG_M527x) += pit.o intc-2.o reset.o obj-$(CONFIG_M5272) += timers.o diff --git a/trunk/arch/m68k/platform/523x/config.c b/trunk/arch/m68k/platform/coldfire/m523x.c similarity index 100% rename from trunk/arch/m68k/platform/523x/config.c rename to trunk/arch/m68k/platform/coldfire/m523x.c