From: <gerg@snapgear.com>
To: linux-m68k@vger.kernel.org, uclinux-dev@uclinux.org
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [PATCH 04/11] m68knommu: move the 5249 platform code into the common ColdFire code directory
Date: Wed, 2 May 2012 11:08:59 +1000 [thread overview]
Message-ID: <1335920946-11297-5-git-send-email-gerg@snapgear.com> (raw)
In-Reply-To: <1335920946-11297-1-git-send-email-gerg@snapgear.com>
From: Greg Ungerer <gerg@uclinux.org>
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>
---
arch/m68k/Makefile | 1 -
arch/m68k/platform/5249/Makefile | 18 ------------------
arch/m68k/platform/coldfire/Makefile | 2 +-
.../{5249/intc2.c => coldfire/intc-5249.c} | 0
.../platform/{5249/config.c => coldfire/m5249.c} | 0
5 files changed, 1 insertions(+), 20 deletions(-)
delete mode 100644 arch/m68k/platform/5249/Makefile
rename arch/m68k/platform/{5249/intc2.c => coldfire/intc-5249.c} (100%)
rename arch/m68k/platform/{5249/config.c => coldfire/m5249.c} (100%)
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 922a7dd..314c10c 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_M5249) += arch/m68k/platform/5249/
core-$(CONFIG_M527x) += arch/m68k/platform/527x/
core-$(CONFIG_M5272) += arch/m68k/platform/5272/
core-$(CONFIG_M528x) += arch/m68k/platform/528x/
diff --git a/arch/m68k/platform/5249/Makefile b/arch/m68k/platform/5249/Makefile
deleted file mode 100644
index 8a0186b..0000000
--- a/arch/m68k/platform/5249/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 intc2.o
-
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index 50a3aef..87ffd2c 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -19,7 +19,7 @@ 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) += m523x.o pit.o dma_timer.o intc-2.o reset.o
-obj-$(CONFIG_M5249) += timers.o intc.o reset.o
+obj-$(CONFIG_M5249) += m5249.o timers.o intc.o intc-5249.o reset.o
obj-$(CONFIG_M527x) += pit.o intc-2.o reset.o
obj-$(CONFIG_M5272) += timers.o
obj-$(CONFIG_M528x) += pit.o intc-2.o reset.o
diff --git a/arch/m68k/platform/5249/intc2.c b/arch/m68k/platform/coldfire/intc-5249.c
similarity index 100%
rename from arch/m68k/platform/5249/intc2.c
rename to arch/m68k/platform/coldfire/intc-5249.c
diff --git a/arch/m68k/platform/5249/config.c b/arch/m68k/platform/coldfire/m5249.c
similarity index 100%
rename from arch/m68k/platform/5249/config.c
rename to arch/m68k/platform/coldfire/m5249.c
--
1.7.0.4
next prev parent reply other threads:[~2012-05-02 1:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-02 1:08 [PATCH 00/11] m68knommu: remove ColdFire sub-architecture directories gerg
2012-05-02 1:08 ` [PATCH 01/11] m68knommu: move the 5206 platform code into the common ColdFire code directory gerg
2012-05-02 1:08 ` [PATCH 02/11] m68knommu: move the 520x " gerg
2012-05-02 1:08 ` [PATCH 03/11] m68knommu: move the 523x " gerg
2012-05-02 1:08 ` gerg [this message]
2012-05-02 1:09 ` [PATCH 05/11] m68knommu: move the 5272 " gerg
2012-05-02 1:09 ` [PATCH 06/11] m68knommu: move the 527x " gerg
2012-05-02 1:09 ` [PATCH 07/11] m68knommu: move the 528x " gerg
2012-05-02 1:09 ` [PATCH 08/11] m68knommu: move the 5307 " gerg
2012-05-02 1:09 ` [PATCH 09/11] m68knommu: move the 5407 " gerg
2012-05-02 1:09 ` [PATCH 10/11] m68knommu: move the 532x " gerg
2012-05-02 1:09 ` [PATCH 11/11] m68knommu: move the 54xx " gerg
2012-05-02 9:16 ` [PATCH 00/11] m68knommu: remove ColdFire sub-architecture directories Geert Uytterhoeven
2012-05-02 9:47 ` Greg Ungerer
2012-05-02 9:50 ` Luis Alves
2012-05-02 14:07 ` Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335920946-11297-5-git-send-email-gerg@snapgear.com \
--to=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-m68k@vger.kernel.org \
--cc=uclinux-dev@uclinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox