[uClinux-dev] [PATCH 00/11] m68knommu: remove ColdFire sub-architecture directories

[gerg]

Currently the different ColdFire sub-archiectures are split up with a
directory for each family type. Most though only contain a small amount
of code, it just doesn't seem to make any sense to keep them separate.

Move all the ColdFire sub-architecture code into the platform/coldfire
directory, and remove the sub-architecture directories. We already build
the common ColdFire components based on sub-architecture type anyway,
so there is very little Makefile change required.

Overall we remove about 200 lines of duplicated Makefile code, and end
up with all the ColdFire specific code in a single directory.

---

arch/m68k/Makefile | 10 ----------
arch/m68k/platform/5206/Makefile | 18 ------------------
arch/m68k/platform/520x/Makefile | 17 -----------------
arch/m68k/platform/523x/Makefile | 17 -----------------
arch/m68k/platform/5249/Makefile | 18 ------------------
arch/m68k/platform/5272/Makefile | 18 ------------------
arch/m68k/platform/527x/Makefile | 18 ------------------
arch/m68k/platform/528x/Makefile | 18 ------------------
arch/m68k/platform/5307/Makefile | 20 --------------------
arch/m68k/platform/532x/Makefile | 18 ------------------
arch/m68k/platform/5407/Makefile | 18 ------------------
arch/m68k/platform/54xx/Makefile | 19 -------------------
arch/m68k/platform/coldfire/Makefile | 24 ++++++++++++++----------
b/arch/m68k/Makefile | 2 --
b/arch/m68k/platform/coldfire/Makefile | 4 ++--
b/arch/m68k/platform/coldfire/m5206.c | 1 -
b/arch/m68k/platform/coldfire/m520x.c | 1 -
b/arch/m68k/platform/coldfire/m523x.c | 1 -
b/arch/m68k/platform/coldfire/m5249.c | 1 -
b/arch/m68k/platform/coldfire/m5272.c | 1 -
b/arch/m68k/platform/coldfire/m527x.c | 1 -
b/arch/m68k/platform/coldfire/m528x.c | 1 -
b/arch/m68k/platform/coldfire/m532x.c | 1 -
b/arch/m68k/platform/coldfire/m5407.c | 1 -
b/arch/m68k/platform/coldfire/m54xx.c | 1 -
b/arch/m68k/platform/coldfire/nettel.c | 1 -
26 files changed, 16 insertions(+), 234 deletions(-)

[gerg]

From: Greg Ungerer <gerg at 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 at uclinux.org>
---
arch/m68k/Makefile | 1 -
arch/m68k/platform/520x/Makefile | 17 -----------------
arch/m68k/platform/coldfire/Makefile | 2 +-
.../platform/{520x/config.c => coldfire/m520x.c} | 0
4 files changed, 1 insertions(+), 19 deletions(-)
delete mode 100644 arch/m68k/platform/520x/Makefile
rename arch/m68k/platform/{520x/config.c => coldfire/m520x.c} (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 8303f3b..090707a 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_M520x) += arch/m68k/platform/520x/
core-$(CONFIG_M523x) += arch/m68k/platform/523x/
core-$(CONFIG_M5249) += arch/m68k/platform/5249/
core-$(CONFIG_M527x) += arch/m68k/platform/527x/
diff --git a/arch/m68k/platform/520x/Makefile b/arch/m68k/platform/520x/Makefile
deleted file mode 100644
index 03e29d1..0000000
--- a/arch/m68k/platform/520x/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile for the M5208 specific file.
-#
-
-#
-# 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/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index ef729b1..60c1efa 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -17,7 +17,7 @@ asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
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) += pit.o intc-simr.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_M5249) += timers.o intc.o reset.o
obj-$(CONFIG_M527x) += pit.o intc-2.o reset.o
diff --git a/arch/m68k/platform/520x/config.c b/arch/m68k/platform/coldfire/m520x.c
similarity index 100%
rename from arch/m68k/platform/520x/config.c
rename to arch/m68k/platform/coldfire/m520x.c

[gerg]

From: Greg Ungerer <gerg at 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 at uclinux.org>
---
arch/m68k/Makefile | 2 --
arch/m68k/platform/5206/Makefile | 18 ------------------
arch/m68k/platform/coldfire/Makefile | 4 ++--
.../platform/{5206/config.c => coldfire/m5206.c} | 0
4 files changed, 2 insertions(+), 22 deletions(-)
delete mode 100644 arch/m68k/platform/5206/Makefile
rename arch/m68k/platform/{5206/config.c => coldfire/m5206.c} (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index cf318f2..8303f3b 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -115,8 +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_M5206) += arch/m68k/platform/5206/
-core-$(CONFIG_M5206e) += arch/m68k/platform/5206/
core-$(CONFIG_M520x) += arch/m68k/platform/520x/
core-$(CONFIG_M523x) += arch/m68k/platform/523x/
core-$(CONFIG_M5249) += arch/m68k/platform/5249/
diff --git a/arch/m68k/platform/5206/Makefile b/arch/m68k/platform/5206/Makefile
deleted file mode 100644
index 8a34a9d..0000000
--- a/arch/m68k/platform/5206/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
-
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index a0815c6..ef729b1 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -15,8 +15,8 @@
asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1

obj-$(CONFIG_COLDFIRE) += cache.o clk.o device.o dma.o entry.o vectors.o
-obj-$(CONFIG_M5206) += timers.o intc.o reset.o
-obj-$(CONFIG_M5206e) += timers.o intc.o reset.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) += pit.o intc-simr.o reset.o
obj-$(CONFIG_M523x) += pit.o dma_timer.o intc-2.o reset.o
obj-$(CONFIG_M5249) += timers.o intc.o reset.o
diff --git a/arch/m68k/platform/5206/config.c b/arch/m68k/platform/coldfire/m5206.c
similarity index 100%
rename from arch/m68k/platform/5206/config.c
rename to arch/m68k/platform/coldfire/m5206.c

[gerg]

From: Greg Ungerer <gerg at 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 at uclinux.org>
---
arch/m68k/Makefile | 1 -
arch/m68k/platform/523x/Makefile | 17 -----------------
arch/m68k/platform/coldfire/Makefile | 2 +-
.../platform/{523x/config.c => coldfire/m523x.c} | 0
4 files changed, 1 insertions(+), 19 deletions(-)
delete mode 100644 arch/m68k/platform/523x/Makefile
rename arch/m68k/platform/{523x/config.c => coldfire/m523x.c} (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 090707a..922a7dd 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_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/arch/m68k/platform/523x/Makefile b/arch/m68k/platform/523x/Makefile
deleted file mode 100644
index e74be69..0000000
--- a/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/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index 60c1efa..50a3aef 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/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/arch/m68k/platform/523x/config.c b/arch/m68k/platform/coldfire/m523x.c
similarity index 100%
rename from arch/m68k/platform/523x/config.c
rename to arch/m68k/platform/coldfire/m523x.c

[gerg]

From: Greg Ungerer <gerg at 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 at 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

[gerg]

From: Greg Ungerer <gerg at 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 at uclinux.org>
---
arch/m68k/Makefile | 1 -
arch/m68k/platform/5272/Makefile | 18 ------------------
arch/m68k/platform/coldfire/Makefile | 2 +-
.../platform/{5272/intc.c => coldfire/intc-5272.c} | 0
.../platform/{5272/config.c => coldfire/m5272.c} | 0
5 files changed, 1 insertions(+), 20 deletions(-)
delete mode 100644 arch/m68k/platform/5272/Makefile
rename arch/m68k/platform/{5272/intc.c => coldfire/intc-5272.c} (100%)
rename arch/m68k/platform/{5272/config.c => coldfire/m5272.c} (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 314c10c..2d7a4d9 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -116,7 +116,6 @@ core-$(CONFIG_M68EZ328) += arch/m68k/platform/68EZ328/
core-$(CONFIG_M68VZ328) += arch/m68k/platform/68VZ328/
core-$(CONFIG_COLDFIRE) += arch/m68k/platform/coldfire/
core-$(CONFIG_M527x) += arch/m68k/platform/527x/
-core-$(CONFIG_M5272) += arch/m68k/platform/5272/
core-$(CONFIG_M528x) += arch/m68k/platform/528x/
core-$(CONFIG_M5307) += arch/m68k/platform/5307/
core-$(CONFIG_M532x) += arch/m68k/platform/532x/
diff --git a/arch/m68k/platform/5272/Makefile b/arch/m68k/platform/5272/Makefile
deleted file mode 100644
index 932ddab..0000000
--- a/arch/m68k/platform/5272/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 intc.o
-
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index 87ffd2c..ec81d05 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -21,7 +21,7 @@ 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) += 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_M5272) += m5272.o intc-5272.o timers.o
obj-$(CONFIG_M528x) += 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
diff --git a/arch/m68k/platform/5272/intc.c b/arch/m68k/platform/coldfire/intc-5272.c
similarity index 100%
rename from arch/m68k/platform/5272/intc.c
rename to arch/m68k/platform/coldfire/intc-5272.c
diff --git a/arch/m68k/platform/5272/config.c b/arch/m68k/platform/coldfire/m5272.c
similarity index 100%
rename from arch/m68k/platform/5272/config.c
rename to arch/m68k/platform/coldfire/m5272.c

[gerg]

From: Greg Ungerer <gerg at 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 at uclinux.org>
---
arch/m68k/Makefile | 1 -
arch/m68k/platform/528x/Makefile | 18 ------------------
arch/m68k/platform/coldfire/Makefile | 2 +-
.../platform/{528x/config.c => coldfire/m528x.c} | 0
4 files changed, 1 insertions(+), 20 deletions(-)
delete mode 100644 arch/m68k/platform/528x/Makefile
rename arch/m68k/platform/{528x/config.c => coldfire/m528x.c} (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 7e138d6..65f5844 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_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/arch/m68k/platform/528x/Makefile b/arch/m68k/platform/528x/Makefile
deleted file mode 100644
index 8755c9e..0000000
--- a/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/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index 8bef346..cdd884e 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/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/arch/m68k/platform/528x/config.c b/arch/m68k/platform/coldfire/m528x.c
similarity index 100%
rename from arch/m68k/platform/528x/config.c
rename to arch/m68k/platform/coldfire/m528x.c

[gerg]

From: Greg Ungerer <gerg at 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 at uclinux.org>
---
arch/m68k/Makefile | 1 -
arch/m68k/platform/527x/Makefile | 18 ------------------
arch/m68k/platform/coldfire/Makefile | 2 +-
.../platform/{527x/config.c => coldfire/m527x.c} | 0
4 files changed, 1 insertions(+), 20 deletions(-)
delete mode 100644 arch/m68k/platform/527x/Makefile
rename arch/m68k/platform/{527x/config.c => coldfire/m527x.c} (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 2d7a4d9..7e138d6 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_M527x) += arch/m68k/platform/527x/
core-$(CONFIG_M528x) += arch/m68k/platform/528x/
core-$(CONFIG_M5307) += arch/m68k/platform/5307/
core-$(CONFIG_M532x) += arch/m68k/platform/532x/
diff --git a/arch/m68k/platform/527x/Makefile b/arch/m68k/platform/527x/Makefile
deleted file mode 100644
index 8755c9e..0000000
--- a/arch/m68k/platform/527x/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/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index ec81d05..8bef346 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -20,7 +20,7 @@ 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) += m5249.o timers.o intc.o intc-5249.o reset.o
-obj-$(CONFIG_M527x) += pit.o intc-2.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_M5307) += timers.o intc.o reset.o
diff --git a/arch/m68k/platform/527x/config.c b/arch/m68k/platform/coldfire/m527x.c
similarity index 100%
rename from arch/m68k/platform/527x/config.c
rename to arch/m68k/platform/coldfire/m527x.c

[gerg]

From: Greg Ungerer <gerg at 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 at 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

[gerg]

From: Greg Ungerer <gerg at 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 at uclinux.org>
---
arch/m68k/Makefile | 1 -
arch/m68k/platform/5407/Makefile | 18 ------------------
arch/m68k/platform/coldfire/Makefile | 2 +-
.../platform/{5407/config.c => coldfire/m5407.c} | 0
4 files changed, 1 insertions(+), 20 deletions(-)
delete mode 100644 arch/m68k/platform/5407/Makefile
rename arch/m68k/platform/{5407/config.c => coldfire/m5407.c} (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 02626a3..333c0c2 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -116,7 +116,6 @@ core-$(CONFIG_M68EZ328) += arch/m68k/platform/68EZ328/
core-$(CONFIG_M68VZ328) += arch/m68k/platform/68VZ328/
core-$(CONFIG_COLDFIRE) += arch/m68k/platform/coldfire/
core-$(CONFIG_M532x) += arch/m68k/platform/532x/
-core-$(CONFIG_M5407) += arch/m68k/platform/5407/
core-$(CONFIG_M54xx) += arch/m68k/platform/54xx/


diff --git a/arch/m68k/platform/5407/Makefile b/arch/m68k/platform/5407/Makefile
deleted file mode 100644
index 24f3cd7..0000000
--- a/arch/m68k/platform/5407/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
-
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index bfe71e0..48dcd06 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -25,7 +25,7 @@ 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) += 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_M5407) += m5407.o timers.o intc.o reset.o
obj-$(CONFIG_M54xx) += sltimers.o intc-2.o

obj-$(CONFIG_NETtel) += nettel.o
diff --git a/arch/m68k/platform/5407/config.c b/arch/m68k/platform/coldfire/m5407.c
similarity index 100%
rename from arch/m68k/platform/5407/config.c
rename to arch/m68k/platform/coldfire/m5407.c

[gerg]

From: Greg Ungerer <gerg at 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 at uclinux.org>
---
arch/m68k/Makefile | 1 -
arch/m68k/platform/5307/Makefile | 20 --------------------
arch/m68k/platform/coldfire/Makefile | 5 ++++-
.../platform/{5307/config.c => coldfire/m5307.c} | 0
arch/m68k/platform/{5307 => coldfire}/nettel.c | 0
5 files changed, 4 insertions(+), 22 deletions(-)
delete mode 100644 arch/m68k/platform/5307/Makefile
rename arch/m68k/platform/{5307/config.c => coldfire/m5307.c} (100%)
rename arch/m68k/platform/{5307 => coldfire}/nettel.c (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 65f5844..02626a3 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_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/arch/m68k/platform/5307/Makefile b/arch/m68k/platform/5307/Makefile
deleted file mode 100644
index fd08186..0000000
--- a/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/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index cdd884e..bfe71e0 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/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/arch/m68k/platform/5307/config.c b/arch/m68k/platform/coldfire/m5307.c
similarity index 100%
rename from arch/m68k/platform/5307/config.c
rename to arch/m68k/platform/coldfire/m5307.c
diff --git a/arch/m68k/platform/5307/nettel.c b/arch/m68k/platform/coldfire/nettel.c
similarity index 100%
rename from arch/m68k/platform/5307/nettel.c
rename to arch/m68k/platform/coldfire/nettel.c

[gerg]

From: Greg Ungerer <gerg at 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 at uclinux.org>
---
arch/m68k/Makefile | 1 -
arch/m68k/platform/532x/Makefile | 18 ------------------
arch/m68k/platform/coldfire/Makefile | 2 +-
.../platform/{532x/config.c => coldfire/m532x.c} | 0
4 files changed, 1 insertions(+), 20 deletions(-)
delete mode 100644 arch/m68k/platform/532x/Makefile
rename arch/m68k/platform/{532x/config.c => coldfire/m532x.c} (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 333c0c2..3154f0f 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_M532x) += arch/m68k/platform/532x/
core-$(CONFIG_M54xx) += arch/m68k/platform/54xx/


diff --git a/arch/m68k/platform/532x/Makefile b/arch/m68k/platform/532x/Makefile
deleted file mode 100644
index c0d8cf8..0000000
--- a/arch/m68k/platform/532x/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 usb-mcf532x.o spi-mcf532x.o
-obj-y := config.o
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index 48dcd06..d6089c1 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -24,7 +24,7 @@ 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) += m5307.o timers.o intc.o reset.o
-obj-$(CONFIG_M532x) += timers.o intc-simr.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

diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/coldfire/m532x.c
similarity index 100%
rename from arch/m68k/platform/532x/config.c
rename to arch/m68k/platform/coldfire/m532x.c

[Geert Uytterhoeven]

Hi Greg,

Post by gerg
Move all the ColdFire sub-architecture code into the platform/coldfire
directory, and remove the sub-architecture directories. We already build
the common ColdFire components based on sub-architecture type anyway,
so there is very little Makefile change required.
?arch/m68k/Makefile ? ? ? ? ? ? ? ? ? ? | ? 10 ----------
?arch/m68k/platform/5206/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/520x/Makefile ? ? ? | ? 17 -----------------
?arch/m68k/platform/523x/Makefile ? ? ? | ? 17 -----------------
?arch/m68k/platform/5249/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/5272/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/527x/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/528x/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/5307/Makefile ? ? ? | ? 20 --------------------
?arch/m68k/platform/532x/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/5407/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/54xx/Makefile ? ? ? | ? 19 -------------------
?arch/m68k/platform/coldfire/Makefile ? | ? 24 ++++++++++++++----------
?b/arch/m68k/Makefile ? ? ? ? ? ? ? ? ? | ? ?2 --
?b/arch/m68k/platform/coldfire/Makefile | ? ?4 ++--

We already had these two files in the diffstat, with different values?

Post by gerg
?b/arch/m68k/platform/coldfire/m5206.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m520x.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m523x.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m5249.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m5272.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m527x.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m528x.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m532x.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m5407.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m54xx.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/nettel.c | ? ?1 -

All of these are created, not deleted?

The actual patches look fine, though ;-)

Gr{oetje,eeting}s,

? ? ? ? ? ? ? ? ? ? ? ? Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
? ? ? ? ? ? ? ? ? ? ? ? ? ?? ?? -- Linus Torvalds

[Greg Ungerer]

Hi Geert,

Post by Geert Uytterhoeven

Post by gerg
Move all the ColdFire sub-architecture code into the platform/coldfire
directory, and remove the sub-architecture directories. We already build
the common ColdFire components based on sub-architecture type anyway,
so there is very little Makefile change required.
arch/m68k/Makefile | 10 ----------
arch/m68k/platform/5206/Makefile | 18 ------------------
arch/m68k/platform/520x/Makefile | 17 -----------------
arch/m68k/platform/523x/Makefile | 17 -----------------
arch/m68k/platform/5249/Makefile | 18 ------------------
arch/m68k/platform/5272/Makefile | 18 ------------------
arch/m68k/platform/527x/Makefile | 18 ------------------
arch/m68k/platform/528x/Makefile | 18 ------------------
arch/m68k/platform/5307/Makefile | 20 --------------------
arch/m68k/platform/532x/Makefile | 18 ------------------
arch/m68k/platform/5407/Makefile | 18 ------------------
arch/m68k/platform/54xx/Makefile | 19 -------------------
arch/m68k/platform/coldfire/Makefile | 24 ++++++++++++++----------
b/arch/m68k/Makefile | 2 --
b/arch/m68k/platform/coldfire/Makefile | 4 ++--

We already had these two files in the diffstat, with different values?

Post by gerg
b/arch/m68k/platform/coldfire/m5206.c | 1 -
b/arch/m68k/platform/coldfire/m520x.c | 1 -
b/arch/m68k/platform/coldfire/m523x.c | 1 -
b/arch/m68k/platform/coldfire/m5249.c | 1 -
b/arch/m68k/platform/coldfire/m5272.c | 1 -
b/arch/m68k/platform/coldfire/m527x.c | 1 -
b/arch/m68k/platform/coldfire/m528x.c | 1 -
b/arch/m68k/platform/coldfire/m532x.c | 1 -
b/arch/m68k/platform/coldfire/m5407.c | 1 -
b/arch/m68k/platform/coldfire/m54xx.c | 1 -
b/arch/m68k/platform/coldfire/nettel.c | 1 -

All of these are created, not deleted?

Yeah, it is pretty odd. I think diffstat is getting confused by the
git rename/delete actions in the diffs. I used git format-patch with
the -M option, since there was so much moving about of files.

Post by Geert Uytterhoeven
The actual patches look fine, though ;-)

Thanks for the review :-)

Regards
Greg


------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg at snapgear.com
SnapGear Group, McAfee PHONE: [phone]
8 Gardner Close, FAX: [phone]
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com

[Luis Alves]

Hi Greg,

I've done a similar thing for the 68000 cpu's. Ended up with a single
platform/68000 directory and removed the 68328, 68EZ328 and 68VZ328
directories.

When I have the time I'll prepare the patches and send them (probably
latter today).
I'm not sure if anyone is still building 3.x kernels for the 68[xx]328
SoC's but would be nice if someone could test building the kernel for
the boards using those chips (hopefully I didn't break up anything).
For the 68000 (and my board) it's working good.

Regards,
Luis

Post by gerg
Currently the different ColdFire sub-archiectures are split up with a
directory for each family type. Most though only contain a small amount
of code, it just doesn't seem to make any sense to keep them separate.
Move all the ColdFire sub-architecture code into the platform/coldfire
directory, and remove the sub-architecture directories. We already build
the common ColdFire components based on sub-architecture type anyway,
so there is very little Makefile change required.
Overall we remove about 200 lines of duplicated Makefile code, and end
up with all the ColdFire specific code in a single directory.
---
?arch/m68k/Makefile ? ? ? ? ? ? ? ? ? ? | ? 10 ----------
?arch/m68k/platform/5206/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/520x/Makefile ? ? ? | ? 17 -----------------
?arch/m68k/platform/523x/Makefile ? ? ? | ? 17 -----------------
?arch/m68k/platform/5249/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/5272/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/527x/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/528x/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/5307/Makefile ? ? ? | ? 20 --------------------
?arch/m68k/platform/532x/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/5407/Makefile ? ? ? | ? 18 ------------------
?arch/m68k/platform/54xx/Makefile ? ? ? | ? 19 -------------------
?arch/m68k/platform/coldfire/Makefile ? | ? 24 ++++++++++++++----------
?b/arch/m68k/Makefile ? ? ? ? ? ? ? ? ? | ? ?2 --
?b/arch/m68k/platform/coldfire/Makefile | ? ?4 ++--
?b/arch/m68k/platform/coldfire/m5206.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m520x.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m523x.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m5249.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m5272.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m527x.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m528x.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m532x.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m5407.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/m54xx.c ?| ? ?1 -
?b/arch/m68k/platform/coldfire/nettel.c | ? ?1 -
?26 files changed, 16 insertions(+), 234 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html

[Greg Ungerer]

Hi Luis,

Post by Luis Alves
I've done a similar thing for the 68000 cpu's. Ended up with a single
platform/68000 directory and removed the 68328, 68EZ328 and 68VZ328
directories.

That sounds great.

Post by Luis Alves
When I have the time I'll prepare the patches and send them (probably
latter today).

Looking forward to them :-)

Post by Luis Alves
I'm not sure if anyone is still building 3.x kernels for the 68[xx]328
SoC's but would be nice if someone could test building the kernel for
the boards using those chips (hopefully I didn't break up anything).
For the 68000 (and my board) it's working good.

I build them occasionally, but I don't have any way to test any
of those targets.

Regards
Greg

Post by Luis Alves

Post by gerg
Currently the different ColdFire sub-archiectures are split up with a
directory for each family type. Most though only contain a small amount
of code, it just doesn't seem to make any sense to keep them separate.
Move all the ColdFire sub-architecture code into the platform/coldfire
directory, and remove the sub-architecture directories. We already build
the common ColdFire components based on sub-architecture type anyway,
so there is very little Makefile change required.
Overall we remove about 200 lines of duplicated Makefile code, and end
up with all the ColdFire specific code in a single directory.
---
??arch/m68k/Makefile ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? | ?? 10 ----------
??arch/m68k/platform/5206/Makefile ?? ?? ?? | ?? 18 ------------------
??arch/m68k/platform/520x/Makefile ?? ?? ?? | ?? 17 -----------------
??arch/m68k/platform/523x/Makefile ?? ?? ?? | ?? 17 -----------------
??arch/m68k/platform/5249/Makefile ?? ?? ?? | ?? 18 ------------------
??arch/m68k/platform/5272/Makefile ?? ?? ?? | ?? 18 ------------------
??arch/m68k/platform/527x/Makefile ?? ?? ?? | ?? 18 ------------------
??arch/m68k/platform/528x/Makefile ?? ?? ?? | ?? 18 ------------------
??arch/m68k/platform/5307/Makefile ?? ?? ?? | ?? 20 --------------------
??arch/m68k/platform/532x/Makefile ?? ?? ?? | ?? 18 ------------------
??arch/m68k/platform/5407/Makefile ?? ?? ?? | ?? 18 ------------------
??arch/m68k/platform/54xx/Makefile ?? ?? ?? | ?? 19 -------------------
??arch/m68k/platform/coldfire/Makefile ?? | ?? 24 ++++++++++++++----------
??b/arch/m68k/Makefile ?? ?? ?? ?? ?? ?? ?? ?? ?? | ?? ??2 --
??b/arch/m68k/platform/coldfire/Makefile | ?? ??4 ++--
??b/arch/m68k/platform/coldfire/m5206.c ??| ?? ??1 -
??b/arch/m68k/platform/coldfire/m520x.c ??| ?? ??1 -
??b/arch/m68k/platform/coldfire/m523x.c ??| ?? ??1 -
??b/arch/m68k/platform/coldfire/m5249.c ??| ?? ??1 -
??b/arch/m68k/platform/coldfire/m5272.c ??| ?? ??1 -
??b/arch/m68k/platform/coldfire/m527x.c ??| ?? ??1 -
??b/arch/m68k/platform/coldfire/m528x.c ??| ?? ??1 -
??b/arch/m68k/platform/coldfire/m532x.c ??| ?? ??1 -
??b/arch/m68k/platform/coldfire/m5407.c ??| ?? ??1 -
??b/arch/m68k/platform/coldfire/m54xx.c ??| ?? ??1 -
??b/arch/m68k/platform/coldfire/nettel.c | ?? ??1 -
??26 files changed, 16 insertions(+), 234 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at ??http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html