From: <gerg@snapgear.com>
To: linux-m68k@vger.kernel.org, uclinux-dev@uclinux.org
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [PATCH 11/11] m68knommu: move the 54xx platform code into the common ColdFire code directory
Date: Wed, 2 May 2012 11:09:06 +1000 [thread overview]
Message-ID: <1335920946-11297-12-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/54xx/Makefile | 19 -------------------
arch/m68k/platform/coldfire/Makefile | 3 ++-
arch/m68k/platform/{54xx => coldfire}/firebee.c | 0
.../platform/{54xx/config.c => coldfire/m54xx.c} | 0
5 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 arch/m68k/platform/54xx/Makefile
rename arch/m68k/platform/{54xx => coldfire}/firebee.c (100%)
rename arch/m68k/platform/{54xx/config.c => coldfire/m54xx.c} (100%)
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 3154f0f..804f139 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_M54xx) += arch/m68k/platform/54xx/
all: zImage
diff --git a/arch/m68k/platform/54xx/Makefile b/arch/m68k/platform/54xx/Makefile
deleted file mode 100644
index 6cfd090..0000000
--- a/arch/m68k/platform/54xx/Makefile
+++ /dev/null
@@ -1,19 +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:
-#
-# EXTRA_CFLAGS += -DTRAP_DBG_INTERRUPT
-# EXTRA_AFLAGS += -DTRAP_DBG_INTERRUPT
-#
-
-asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
-
-obj-y := config.o
-obj-$(CONFIG_FIREBEE) += firebee.o
-
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index d6089c1..76d389d 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -26,10 +26,11 @@ obj-$(CONFIG_M528x) += m528x.o pit.o intc-2.o reset.o
obj-$(CONFIG_M5307) += m5307.o timers.o intc.o reset.o
obj-$(CONFIG_M532x) += m532x.o timers.o intc-simr.o reset.o
obj-$(CONFIG_M5407) += m5407.o timers.o intc.o reset.o
-obj-$(CONFIG_M54xx) += sltimers.o intc-2.o
+obj-$(CONFIG_M54xx) += m54xx.o sltimers.o intc-2.o
obj-$(CONFIG_NETtel) += nettel.o
obj-$(CONFIG_CLEOPATRA) += nettel.o
+obj-$(CONFIG_FIREBEE) += firebee.o
obj-y += pinmux.o gpio.o
extra-y := head.o
diff --git a/arch/m68k/platform/54xx/firebee.c b/arch/m68k/platform/coldfire/firebee.c
similarity index 100%
rename from arch/m68k/platform/54xx/firebee.c
rename to arch/m68k/platform/coldfire/firebee.c
diff --git a/arch/m68k/platform/54xx/config.c b/arch/m68k/platform/coldfire/m54xx.c
similarity index 100%
rename from arch/m68k/platform/54xx/config.c
rename to arch/m68k/platform/coldfire/m54xx.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 ` [PATCH 04/11] m68knommu: move the 5249 " gerg
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 ` gerg [this message]
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-12-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