[PATCH 0/2] m68k: propose move of platform coldfire

[PATCH 0/2] m68k: propose move of platform coldfire

[gerg]

Hi All,

I propose that we move the arch/m68k/platform/coldfire directory to be
directly under arch/m68k.

The current platform/ structure was inhereted from the move of m68knommu,
and is inconsistent with the existing m68k platforms (each having a
directory under arch/m68k).

Moving platform/coldfire is quite strait forward. The following patches do a
move, and fix up the broken pathname comments.

This does leave the question of what to do with the other directories still
under arch/m68k/platform, namely 68000 and 68360. Should they be moved in
the same way as coldfire? 

Regards
Greg

[PATCH 1/2] m68k: move coldfire platform code

[gerg]

From: Greg Ungerer <gerg@uclinux.org>

Move the m68k ColdFire platform support code directory to be with the
existing m68k platforms. Although the ColdFire is not a platform as such,
we have always kept all its support together. No reason to change that
as this time.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
 arch/m68k/Makefile                            | 4 ++--
 arch/m68k/{platform => }/coldfire/Makefile    | 0
 arch/m68k/{platform => }/coldfire/cache.c     | 0
 arch/m68k/{platform => }/coldfire/clk.c       | 0
 arch/m68k/{platform => }/coldfire/device.c    | 0
 arch/m68k/{platform => }/coldfire/dma.c       | 0
 arch/m68k/{platform => }/coldfire/dma_timer.c | 0
 arch/m68k/{platform => }/coldfire/entry.S     | 0
 arch/m68k/{platform => }/coldfire/firebee.c   | 0
 arch/m68k/{platform => }/coldfire/gpio.c      | 0
 arch/m68k/{platform => }/coldfire/head.S      | 0
 arch/m68k/{platform => }/coldfire/intc-2.c    | 0
 arch/m68k/{platform => }/coldfire/intc-5249.c | 0
 arch/m68k/{platform => }/coldfire/intc-525x.c | 0
 arch/m68k/{platform => }/coldfire/intc-5272.c | 0
 arch/m68k/{platform => }/coldfire/intc-simr.c | 0
 arch/m68k/{platform => }/coldfire/intc.c      | 0
 arch/m68k/{platform => }/coldfire/m5206.c     | 0
 arch/m68k/{platform => }/coldfire/m520x.c     | 0
 arch/m68k/{platform => }/coldfire/m523x.c     | 0
 arch/m68k/{platform => }/coldfire/m5249.c     | 0
 arch/m68k/{platform => }/coldfire/m525x.c     | 0
 arch/m68k/{platform => }/coldfire/m5272.c     | 0
 arch/m68k/{platform => }/coldfire/m527x.c     | 0
 arch/m68k/{platform => }/coldfire/m528x.c     | 0
 arch/m68k/{platform => }/coldfire/m5307.c     | 0
 arch/m68k/{platform => }/coldfire/m53xx.c     | 0
 arch/m68k/{platform => }/coldfire/m5407.c     | 0
 arch/m68k/{platform => }/coldfire/m5441x.c    | 0
 arch/m68k/{platform => }/coldfire/m54xx.c     | 0
 arch/m68k/{platform => }/coldfire/mcf8390.c   | 0
 arch/m68k/{platform => }/coldfire/nettel.c    | 0
 arch/m68k/{platform => }/coldfire/pci.c       | 0
 arch/m68k/{platform => }/coldfire/pit.c       | 0
 arch/m68k/{platform => }/coldfire/reset.c     | 0
 arch/m68k/{platform => }/coldfire/sltimers.c  | 0
 arch/m68k/{platform => }/coldfire/timers.c    | 0
 arch/m68k/{platform => }/coldfire/vectors.c   | 0
 38 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/m68k/{platform => }/coldfire/Makefile (100%)
 rename arch/m68k/{platform => }/coldfire/cache.c (100%)
 rename arch/m68k/{platform => }/coldfire/clk.c (100%)
 rename arch/m68k/{platform => }/coldfire/device.c (100%)
 rename arch/m68k/{platform => }/coldfire/dma.c (100%)
 rename arch/m68k/{platform => }/coldfire/dma_timer.c (100%)
 rename arch/m68k/{platform => }/coldfire/entry.S (100%)
 rename arch/m68k/{platform => }/coldfire/firebee.c (100%)
 rename arch/m68k/{platform => }/coldfire/gpio.c (100%)
 rename arch/m68k/{platform => }/coldfire/head.S (100%)
 rename arch/m68k/{platform => }/coldfire/intc-2.c (100%)
 rename arch/m68k/{platform => }/coldfire/intc-5249.c (100%)
 rename arch/m68k/{platform => }/coldfire/intc-525x.c (100%)
 rename arch/m68k/{platform => }/coldfire/intc-5272.c (100%)
 rename arch/m68k/{platform => }/coldfire/intc-simr.c (100%)
 rename arch/m68k/{platform => }/coldfire/intc.c (100%)
 rename arch/m68k/{platform => }/coldfire/m5206.c (100%)
 rename arch/m68k/{platform => }/coldfire/m520x.c (100%)
 rename arch/m68k/{platform => }/coldfire/m523x.c (100%)
 rename arch/m68k/{platform => }/coldfire/m5249.c (100%)
 rename arch/m68k/{platform => }/coldfire/m525x.c (100%)
 rename arch/m68k/{platform => }/coldfire/m5272.c (100%)
 rename arch/m68k/{platform => }/coldfire/m527x.c (100%)
 rename arch/m68k/{platform => }/coldfire/m528x.c (100%)
 rename arch/m68k/{platform => }/coldfire/m5307.c (100%)
 rename arch/m68k/{platform => }/coldfire/m53xx.c (100%)
 rename arch/m68k/{platform => }/coldfire/m5407.c (100%)
 rename arch/m68k/{platform => }/coldfire/m5441x.c (100%)
 rename arch/m68k/{platform => }/coldfire/m54xx.c (100%)
 rename arch/m68k/{platform => }/coldfire/mcf8390.c (100%)
 rename arch/m68k/{platform => }/coldfire/nettel.c (100%)
 rename arch/m68k/{platform => }/coldfire/pci.c (100%)
 rename arch/m68k/{platform => }/coldfire/pit.c (100%)
 rename arch/m68k/{platform => }/coldfire/reset.c (100%)
 rename arch/m68k/{platform => }/coldfire/sltimers.c (100%)
 rename arch/m68k/{platform => }/coldfire/timers.c (100%)
 rename arch/m68k/{platform => }/coldfire/vectors.c (100%)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 7f7830f..2e24775 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -94,7 +94,7 @@ head-y				:= arch/m68k/kernel/head.o
 head-$(CONFIG_SUN3)		:= arch/m68k/kernel/sun3-head.o
 head-$(CONFIG_M68360)		:= arch/m68k/platform/68360/head.o
 head-$(CONFIG_M68000)		:= arch/m68k/platform/68000/head.o
-head-$(CONFIG_COLDFIRE)		:= arch/m68k/platform/coldfire/head.o
+head-$(CONFIG_COLDFIRE)		:= arch/m68k/coldfire/head.o
 
 core-y				+= arch/m68k/kernel/	arch/m68k/mm/
 libs-y				+= arch/m68k/lib/
@@ -116,7 +116,7 @@ core-$(CONFIG_M68060)		+= arch/m68k/ifpsp060/
 core-$(CONFIG_M68KFPU_EMU)	+= arch/m68k/math-emu/
 core-$(CONFIG_M68360)		+= arch/m68k/platform/68360/
 core-$(CONFIG_M68000)		+= arch/m68k/platform/68000/
-core-$(CONFIG_COLDFIRE)		+= arch/m68k/platform/coldfire/
+core-$(CONFIG_COLDFIRE)		+= arch/m68k/coldfire/
 
 
 all:	zImage
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/coldfire/Makefile
similarity index 100%
rename from arch/m68k/platform/coldfire/Makefile
rename to arch/m68k/coldfire/Makefile
diff --git a/arch/m68k/platform/coldfire/cache.c b/arch/m68k/coldfire/cache.c
similarity index 100%
rename from arch/m68k/platform/coldfire/cache.c
rename to arch/m68k/coldfire/cache.c
diff --git a/arch/m68k/platform/coldfire/clk.c b/arch/m68k/coldfire/clk.c
similarity index 100%
rename from arch/m68k/platform/coldfire/clk.c
rename to arch/m68k/coldfire/clk.c
diff --git a/arch/m68k/platform/coldfire/device.c b/arch/m68k/coldfire/device.c
similarity index 100%
rename from arch/m68k/platform/coldfire/device.c
rename to arch/m68k/coldfire/device.c
diff --git a/arch/m68k/platform/coldfire/dma.c b/arch/m68k/coldfire/dma.c
similarity index 100%
rename from arch/m68k/platform/coldfire/dma.c
rename to arch/m68k/coldfire/dma.c
diff --git a/arch/m68k/platform/coldfire/dma_timer.c b/arch/m68k/coldfire/dma_timer.c
similarity index 100%
rename from arch/m68k/platform/coldfire/dma_timer.c
rename to arch/m68k/coldfire/dma_timer.c
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/coldfire/entry.S
similarity index 100%
rename from arch/m68k/platform/coldfire/entry.S
rename to arch/m68k/coldfire/entry.S
diff --git a/arch/m68k/platform/coldfire/firebee.c b/arch/m68k/coldfire/firebee.c
similarity index 100%
rename from arch/m68k/platform/coldfire/firebee.c
rename to arch/m68k/coldfire/firebee.c
diff --git a/arch/m68k/platform/coldfire/gpio.c b/arch/m68k/coldfire/gpio.c
similarity index 100%
rename from arch/m68k/platform/coldfire/gpio.c
rename to arch/m68k/coldfire/gpio.c
diff --git a/arch/m68k/platform/coldfire/head.S b/arch/m68k/coldfire/head.S
similarity index 100%
rename from arch/m68k/platform/coldfire/head.S
rename to arch/m68k/coldfire/head.S
diff --git a/arch/m68k/platform/coldfire/intc-2.c b/arch/m68k/coldfire/intc-2.c
similarity index 100%
rename from arch/m68k/platform/coldfire/intc-2.c
rename to arch/m68k/coldfire/intc-2.c
diff --git a/arch/m68k/platform/coldfire/intc-5249.c b/arch/m68k/coldfire/intc-5249.c
similarity index 100%
rename from arch/m68k/platform/coldfire/intc-5249.c
rename to arch/m68k/coldfire/intc-5249.c
diff --git a/arch/m68k/platform/coldfire/intc-525x.c b/arch/m68k/coldfire/intc-525x.c
similarity index 100%
rename from arch/m68k/platform/coldfire/intc-525x.c
rename to arch/m68k/coldfire/intc-525x.c
diff --git a/arch/m68k/platform/coldfire/intc-5272.c b/arch/m68k/coldfire/intc-5272.c
similarity index 100%
rename from arch/m68k/platform/coldfire/intc-5272.c
rename to arch/m68k/coldfire/intc-5272.c
diff --git a/arch/m68k/platform/coldfire/intc-simr.c b/arch/m68k/coldfire/intc-simr.c
similarity index 100%
rename from arch/m68k/platform/coldfire/intc-simr.c
rename to arch/m68k/coldfire/intc-simr.c
diff --git a/arch/m68k/platform/coldfire/intc.c b/arch/m68k/coldfire/intc.c
similarity index 100%
rename from arch/m68k/platform/coldfire/intc.c
rename to arch/m68k/coldfire/intc.c
diff --git a/arch/m68k/platform/coldfire/m5206.c b/arch/m68k/coldfire/m5206.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m5206.c
rename to arch/m68k/coldfire/m5206.c
diff --git a/arch/m68k/platform/coldfire/m520x.c b/arch/m68k/coldfire/m520x.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m520x.c
rename to arch/m68k/coldfire/m520x.c
diff --git a/arch/m68k/platform/coldfire/m523x.c b/arch/m68k/coldfire/m523x.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m523x.c
rename to arch/m68k/coldfire/m523x.c
diff --git a/arch/m68k/platform/coldfire/m5249.c b/arch/m68k/coldfire/m5249.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m5249.c
rename to arch/m68k/coldfire/m5249.c
diff --git a/arch/m68k/platform/coldfire/m525x.c b/arch/m68k/coldfire/m525x.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m525x.c
rename to arch/m68k/coldfire/m525x.c
diff --git a/arch/m68k/platform/coldfire/m5272.c b/arch/m68k/coldfire/m5272.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m5272.c
rename to arch/m68k/coldfire/m5272.c
diff --git a/arch/m68k/platform/coldfire/m527x.c b/arch/m68k/coldfire/m527x.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m527x.c
rename to arch/m68k/coldfire/m527x.c
diff --git a/arch/m68k/platform/coldfire/m528x.c b/arch/m68k/coldfire/m528x.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m528x.c
rename to arch/m68k/coldfire/m528x.c
diff --git a/arch/m68k/platform/coldfire/m5307.c b/arch/m68k/coldfire/m5307.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m5307.c
rename to arch/m68k/coldfire/m5307.c
diff --git a/arch/m68k/platform/coldfire/m53xx.c b/arch/m68k/coldfire/m53xx.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m53xx.c
rename to arch/m68k/coldfire/m53xx.c
diff --git a/arch/m68k/platform/coldfire/m5407.c b/arch/m68k/coldfire/m5407.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m5407.c
rename to arch/m68k/coldfire/m5407.c
diff --git a/arch/m68k/platform/coldfire/m5441x.c b/arch/m68k/coldfire/m5441x.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m5441x.c
rename to arch/m68k/coldfire/m5441x.c
diff --git a/arch/m68k/platform/coldfire/m54xx.c b/arch/m68k/coldfire/m54xx.c
similarity index 100%
rename from arch/m68k/platform/coldfire/m54xx.c
rename to arch/m68k/coldfire/m54xx.c
diff --git a/arch/m68k/platform/coldfire/mcf8390.c b/arch/m68k/coldfire/mcf8390.c
similarity index 100%
rename from arch/m68k/platform/coldfire/mcf8390.c
rename to arch/m68k/coldfire/mcf8390.c
diff --git a/arch/m68k/platform/coldfire/nettel.c b/arch/m68k/coldfire/nettel.c
similarity index 100%
rename from arch/m68k/platform/coldfire/nettel.c
rename to arch/m68k/coldfire/nettel.c
diff --git a/arch/m68k/platform/coldfire/pci.c b/arch/m68k/coldfire/pci.c
similarity index 100%
rename from arch/m68k/platform/coldfire/pci.c
rename to arch/m68k/coldfire/pci.c
diff --git a/arch/m68k/platform/coldfire/pit.c b/arch/m68k/coldfire/pit.c
similarity index 100%
rename from arch/m68k/platform/coldfire/pit.c
rename to arch/m68k/coldfire/pit.c
diff --git a/arch/m68k/platform/coldfire/reset.c b/arch/m68k/coldfire/reset.c
similarity index 100%
rename from arch/m68k/platform/coldfire/reset.c
rename to arch/m68k/coldfire/reset.c
diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/coldfire/sltimers.c
similarity index 100%
rename from arch/m68k/platform/coldfire/sltimers.c
rename to arch/m68k/coldfire/sltimers.c
diff --git a/arch/m68k/platform/coldfire/timers.c b/arch/m68k/coldfire/timers.c
similarity index 100%
rename from arch/m68k/platform/coldfire/timers.c
rename to arch/m68k/coldfire/timers.c
diff --git a/arch/m68k/platform/coldfire/vectors.c b/arch/m68k/coldfire/vectors.c
similarity index 100%
rename from arch/m68k/platform/coldfire/vectors.c
rename to arch/m68k/coldfire/vectors.c
-- 
1.9.1

[PATCH 2/2] m68k: fix crufty ColdFire intro comments

[gerg]

From: Greg Ungerer <gerg@uclinux.org>

Quite a few of the ColdFire specific support files have a pathname in the
title comments of the file. These files have moved around a bit over the
years, and most are no longer accurate. Remove the pathname and fix the
comments to include at least a short description of the files contents.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
 arch/m68k/coldfire/entry.S   | 2 +-
 arch/m68k/coldfire/m5206.c   | 2 +-
 arch/m68k/coldfire/m520x.c   | 2 +-
 arch/m68k/coldfire/m523x.c   | 2 +-
 arch/m68k/coldfire/m5249.c   | 2 +-
 arch/m68k/coldfire/m525x.c   | 2 +-
 arch/m68k/coldfire/m5272.c   | 2 +-
 arch/m68k/coldfire/m527x.c   | 4 ++--
 arch/m68k/coldfire/m528x.c   | 2 +-
 arch/m68k/coldfire/m5307.c   | 2 +-
 arch/m68k/coldfire/m5407.c   | 2 +-
 arch/m68k/coldfire/m54xx.c   | 2 +-
 arch/m68k/coldfire/vectors.c | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/arch/m68k/coldfire/entry.S b/arch/m68k/coldfire/entry.S
index 881ab8e..52d312d 100644
--- a/arch/m68k/coldfire/entry.S
+++ b/arch/m68k/coldfire/entry.S
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m68knommu/platform/5307/entry.S
+ *  entry.S  -- interrupt and exception processing for ColdFire
  *
  *  Copyright (C) 1999-2007, Greg Ungerer (gerg@snapgear.com)
  *  Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
diff --git a/arch/m68k/coldfire/m5206.c b/arch/m68k/coldfire/m5206.c
index 0e55f44..8945f5e 100644
--- a/arch/m68k/coldfire/m5206.c
+++ b/arch/m68k/coldfire/m5206.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *	linux/arch/m68knommu/platform/5206/config.c
+ *	m5206.c  -- platform support for ColdFire 5206 based boards
  *
  *	Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
  * 	Copyright (C) 2000-2001, Lineo Inc. (www.lineo.com) 
diff --git a/arch/m68k/coldfire/m520x.c b/arch/m68k/coldfire/m520x.c
index 4040a3c..173834f 100644
--- a/arch/m68k/coldfire/m520x.c
+++ b/arch/m68k/coldfire/m520x.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *  linux/arch/m68knommu/platform/520x/config.c
+ *  m520x.c  -- platform support for ColdFire 520x based boards
  *
  *  Copyright (C) 2005,      Freescale (www.freescale.com)
  *  Copyright (C) 2005,      Intec Automation (mike@steroidmicros.com)
diff --git a/arch/m68k/coldfire/m523x.c b/arch/m68k/coldfire/m523x.c
index 6b7135e..a191a46 100644
--- a/arch/m68k/coldfire/m523x.c
+++ b/arch/m68k/coldfire/m523x.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *	linux/arch/m68knommu/platform/523x/config.c
+ *	m523x.c  -- platform support for ColdFire 523x based boards
  *
  *	Sub-architcture dependent initialization code for the Freescale
  *	523x CPUs.
diff --git a/arch/m68k/coldfire/m5249.c b/arch/m68k/coldfire/m5249.c
index f6253a3..e48f55a 100644
--- a/arch/m68k/coldfire/m5249.c
+++ b/arch/m68k/coldfire/m5249.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *	linux/arch/m68knommu/platform/5249/config.c
+ *	m5249.c  -- platform support for ColdFire 5249 based boards
  *
  *	Copyright (C) 2002, Greg Ungerer (gerg@snapgear.com)
  */
diff --git a/arch/m68k/coldfire/m525x.c b/arch/m68k/coldfire/m525x.c
index 1adba39..3d8583e 100644
--- a/arch/m68k/coldfire/m525x.c
+++ b/arch/m68k/coldfire/m525x.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *	525x.c
+ *	525x.c  -- platform support for ColdFire 525x based boards
  *
  *	Copyright (C) 2012, Steven King <sfking@fdwdc.com>
  */
diff --git a/arch/m68k/coldfire/m5272.c b/arch/m68k/coldfire/m5272.c
index 8a4d3cc..b15219e 100644
--- a/arch/m68k/coldfire/m5272.c
+++ b/arch/m68k/coldfire/m5272.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *	linux/arch/m68knommu/platform/5272/config.c
+ *	m5272.c  -- platform support for ColdFire 5272 based boards
  *
  *	Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
  *	Copyright (C) 2001-2002, SnapGear Inc. (www.snapgear.com)
diff --git a/arch/m68k/coldfire/m527x.c b/arch/m68k/coldfire/m527x.c
index 62d81ef..2ba4707 100644
--- a/arch/m68k/coldfire/m527x.c
+++ b/arch/m68k/coldfire/m527x.c
@@ -1,10 +1,10 @@
 /***************************************************************************/
 
 /*
- *	linux/arch/m68knommu/platform/527x/config.c
+ *	m527x.c  -- platform support for ColdFire 527x based boards
  *
  *	Sub-architcture dependent initialization code for the Freescale
- *	5270/5271 CPUs.
+ *	5270/5271 and 5274/5275 CPUs.
  *
  *	Copyright (C) 1999-2004, Greg Ungerer (gerg@snapgear.com)
  *	Copyright (C) 2001-2004, SnapGear Inc. (www.snapgear.com)
diff --git a/arch/m68k/coldfire/m528x.c b/arch/m68k/coldfire/m528x.c
index 21cd161..45e947a 100644
--- a/arch/m68k/coldfire/m528x.c
+++ b/arch/m68k/coldfire/m528x.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *	linux/arch/m68knommu/platform/528x/config.c
+ *	m528x.c  -- platform support for ColdFire 528x based boards
  *
  *	Sub-architcture dependent initialization code for the Freescale
  *	5280, 5281 and 5282 CPUs.
diff --git a/arch/m68k/coldfire/m5307.c b/arch/m68k/coldfire/m5307.c
index 8874353..2da1d14 100644
--- a/arch/m68k/coldfire/m5307.c
+++ b/arch/m68k/coldfire/m5307.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *	linux/arch/m68knommu/platform/5307/config.c
+ *	m5307.c  -- platform support for ColdFire 5307 based boards
  *
  *	Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
  *	Copyright (C) 2000, Lineo (www.lineo.com)
diff --git a/arch/m68k/coldfire/m5407.c b/arch/m68k/coldfire/m5407.c
index 2fb3cdb..738eba6 100644
--- a/arch/m68k/coldfire/m5407.c
+++ b/arch/m68k/coldfire/m5407.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *	linux/arch/m68knommu/platform/5407/config.c
+ *	m5407.c  -- platform support for ColdFire 5407 based boards
  *
  *	Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
  *	Copyright (C) 2000, Lineo (www.lineo.com)
diff --git a/arch/m68k/coldfire/m54xx.c b/arch/m68k/coldfire/m54xx.c
index 952da53..eec7f71 100644
--- a/arch/m68k/coldfire/m54xx.c
+++ b/arch/m68k/coldfire/m54xx.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *	linux/arch/m68knommu/platform/54xx/config.c
+ *	m54xx.c  -- platform support for ColdFire 54xx based boards
  *
  *	Copyright (C) 2010, Philippe De Muyter <phdm@macqel.be>
  */
diff --git a/arch/m68k/coldfire/vectors.c b/arch/m68k/coldfire/vectors.c
index a4dbdec..08923fe6 100644
--- a/arch/m68k/coldfire/vectors.c
+++ b/arch/m68k/coldfire/vectors.c
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *	linux/arch/m68knommu/platform/coldfire/vectors.c
+ *	vectors.c  -- high level trap setup for ColdFire
  *
  *	Copyright (C) 1999-2007, Greg Ungerer <gerg@snapgear.com>
  */
-- 
1.9.1

Re: [PATCH 0/2] m68k: propose move of platform coldfire

[Geert Uytterhoeven]

Hi Greg,

On Thu, Aug 21, 2014 at 5:04 AM,  <gerg@uclinux.org> wrote:
> I propose that we move the arch/m68k/platform/coldfire directory to be
> directly under arch/m68k.
>
> The current platform/ structure was inhereted from the move of m68knommu,
> and is inconsistent with the existing m68k platforms (each having a
> directory under arch/m68k).
>
> Moving platform/coldfire is quite strait forward. The following patches do a
> move, and fix up the broken pathname comments.

That sounds fine to me.

> This does leave the question of what to do with the other directories still
> under arch/m68k/platform, namely 68000 and 68360. Should they be moved in
> the same way as coldfire?

I think the 68*328 and 68360 SoC support can have their own directories,
as these are platforms.

However, these directories also contain 68000 and 68360 CPU support,
which we may want to share with other platforms in the future, to support
68000-based Amigas, Ataris, Macs, Suns, ...

But as that's a problem to fix when someone is working on it, it's fine
for me to move these one level up, too.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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

Re: [PATCH 0/2] m68k: propose move of platform coldfire

[Greg Ungerer]

Hi Geert,

On 21/08/14 17:30, Geert Uytterhoeven wrote:
> Hi Greg,
>
> On Thu, Aug 21, 2014 at 5:04 AM,  <gerg@uclinux.org> wrote:
>> I propose that we move the arch/m68k/platform/coldfire directory to be
>> directly under arch/m68k.
>>
>> The current platform/ structure was inhereted from the move of m68knommu,
>> and is inconsistent with the existing m68k platforms (each having a
>> directory under arch/m68k).
>>
>> Moving platform/coldfire is quite strait forward. The following patches do a
>> move, and fix up the broken pathname comments.
> That sounds fine to me.
>
>> This does leave the question of what to do with the other directories still
>> under arch/m68k/platform, namely 68000 and 68360. Should they be moved in
>> the same way as coldfire?
> I think the 68*328 and 68360 SoC support can have their own directories,
> as these are platforms.
>
> However, these directories also contain 68000 and 68360 CPU support,
> which we may want to share with other platforms in the future, to support
> 68000-based Amigas, Ataris, Macs, Suns, ...
>
> But as that's a problem to fix when someone is working on it, it's fine
> for me to move these one level up, too.

Thanks for the feedback. I'll prepare patches that move these too then.

Regards
Greg

Re: [PATCH 0/2] m68k: propose move of platform coldfire

[Geert Uytterhoeven]

On Thu, Aug 21, 2014 at 9:30 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Thu, Aug 21, 2014 at 5:04 AM,  <gerg@uclinux.org> wrote:
>> I propose that we move the arch/m68k/platform/coldfire directory to be
>> directly under arch/m68k.
>>
>> The current platform/ structure was inhereted from the move of m68knommu,
>> and is inconsistent with the existing m68k platforms (each having a
>> directory under arch/m68k).
>>
>> Moving platform/coldfire is quite strait forward. The following patches do a
>> move, and fix up the broken pathname comments.
>
> That sounds fine to me.

All 2 of this series:
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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