* [PATCH 2/4] m68k: move non-mmu 68360 platform code
2014-08-21 13:24 [PATCH 1/4] m68k: move non-mmu 68000 platform code gerg
@ 2014-08-21 13:24 ` gerg
2014-08-21 13:24 ` [PATCH 3/4] m68k: remove the unused arch/m68k/platform directory gerg
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: gerg @ 2014-08-21 13:24 UTC (permalink / raw)
To: linux-m68k; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
The non-mmu 68360 specific code is inconsistently placed under a directory
named "platform". Move it to arch/m68k/ along with the other platform and
board directories.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/{platform => }/68360/Makefile | 0
arch/m68k/{platform => }/68360/commproc.c | 0
arch/m68k/{platform => }/68360/config.c | 0
arch/m68k/{platform => }/68360/entry.S | 0
arch/m68k/{platform => }/68360/head-ram.S | 0
arch/m68k/{platform => }/68360/head-rom.S | 0
arch/m68k/{platform => }/68360/ints.c | 0
arch/m68k/Makefile | 4 ++--
8 files changed, 2 insertions(+), 2 deletions(-)
rename arch/m68k/{platform => }/68360/Makefile (100%)
rename arch/m68k/{platform => }/68360/commproc.c (100%)
rename arch/m68k/{platform => }/68360/config.c (100%)
rename arch/m68k/{platform => }/68360/entry.S (100%)
rename arch/m68k/{platform => }/68360/head-ram.S (100%)
rename arch/m68k/{platform => }/68360/head-rom.S (100%)
rename arch/m68k/{platform => }/68360/ints.c (100%)
diff --git a/arch/m68k/platform/68360/Makefile b/arch/m68k/68360/Makefile
similarity index 100%
rename from arch/m68k/platform/68360/Makefile
rename to arch/m68k/68360/Makefile
diff --git a/arch/m68k/platform/68360/commproc.c b/arch/m68k/68360/commproc.c
similarity index 100%
rename from arch/m68k/platform/68360/commproc.c
rename to arch/m68k/68360/commproc.c
diff --git a/arch/m68k/platform/68360/config.c b/arch/m68k/68360/config.c
similarity index 100%
rename from arch/m68k/platform/68360/config.c
rename to arch/m68k/68360/config.c
diff --git a/arch/m68k/platform/68360/entry.S b/arch/m68k/68360/entry.S
similarity index 100%
rename from arch/m68k/platform/68360/entry.S
rename to arch/m68k/68360/entry.S
diff --git a/arch/m68k/platform/68360/head-ram.S b/arch/m68k/68360/head-ram.S
similarity index 100%
rename from arch/m68k/platform/68360/head-ram.S
rename to arch/m68k/68360/head-ram.S
diff --git a/arch/m68k/platform/68360/head-rom.S b/arch/m68k/68360/head-rom.S
similarity index 100%
rename from arch/m68k/platform/68360/head-rom.S
rename to arch/m68k/68360/head-rom.S
diff --git a/arch/m68k/platform/68360/ints.c b/arch/m68k/68360/ints.c
similarity index 100%
rename from arch/m68k/platform/68360/ints.c
rename to arch/m68k/68360/ints.c
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index dd96fc2..0b29dcf 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -92,7 +92,7 @@ endif
#
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_M68360) := arch/m68k/68360/head.o
head-$(CONFIG_M68000) := arch/m68k/68000/head.o
head-$(CONFIG_COLDFIRE) := arch/m68k/coldfire/head.o
@@ -114,7 +114,7 @@ core-$(CONFIG_NATFEAT) += arch/m68k/emu/
core-$(CONFIG_M68040) += arch/m68k/fpsp040/
core-$(CONFIG_M68060) += arch/m68k/ifpsp060/
core-$(CONFIG_M68KFPU_EMU) += arch/m68k/math-emu/
-core-$(CONFIG_M68360) += arch/m68k/platform/68360/
+core-$(CONFIG_M68360) += arch/m68k/68360/
core-$(CONFIG_M68000) += arch/m68k/68000/
core-$(CONFIG_COLDFIRE) += arch/m68k/coldfire/
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/4] m68k: remove the unused arch/m68k/platform directory
2014-08-21 13:24 [PATCH 1/4] m68k: move non-mmu 68000 platform code gerg
2014-08-21 13:24 ` [PATCH 2/4] m68k: move non-mmu 68360 " gerg
@ 2014-08-21 13:24 ` gerg
2014-08-21 13:24 ` [PATCH 4/4] m68k: fix crufty 68000 and 68360 intro comments gerg
2014-08-21 13:32 ` [PATCH 1/4] m68k: move non-mmu 68000 platform code Geert Uytterhoeven
3 siblings, 0 replies; 7+ messages in thread
From: gerg @ 2014-08-21 13:24 UTC (permalink / raw)
To: linux-m68k; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
The non-mmu platform/machine directories have been move up one level.
We no longer need arch/m68k/platform, or its Makefile, so remove them.
---
arch/m68k/platform/Makefile | 3 ---
1 file changed, 3 deletions(-)
delete mode 100644 arch/m68k/platform/Makefile
diff --git a/arch/m68k/platform/Makefile b/arch/m68k/platform/Makefile
deleted file mode 100644
index fc932bf..0000000
--- a/arch/m68k/platform/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Makefile for the arch/m68knommu/platform.
-#
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] m68k: fix crufty 68000 and 68360 intro comments
2014-08-21 13:24 [PATCH 1/4] m68k: move non-mmu 68000 platform code gerg
2014-08-21 13:24 ` [PATCH 2/4] m68k: move non-mmu 68360 " gerg
2014-08-21 13:24 ` [PATCH 3/4] m68k: remove the unused arch/m68k/platform directory gerg
@ 2014-08-21 13:24 ` gerg
2014-08-21 13:32 ` [PATCH 1/4] m68k: move non-mmu 68000 platform code Geert Uytterhoeven
3 siblings, 0 replies; 7+ messages in thread
From: gerg @ 2014-08-21 13:24 UTC (permalink / raw)
To: linux-m68k; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
Quite a few of the non-mmu 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/68000/entry.S | 2 +-
arch/m68k/68360/Makefile | 2 +-
arch/m68k/68360/config.c | 2 +-
arch/m68k/68360/entry.S | 2 +-
arch/m68k/68360/head-ram.S | 5 ++---
arch/m68k/68360/head-rom.S | 5 ++---
arch/m68k/68360/ints.c | 2 +-
7 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch/m68k/68000/entry.S b/arch/m68k/68000/entry.S
index 23ac054..259b366 100644
--- a/arch/m68k/68000/entry.S
+++ b/arch/m68k/68000/entry.S
@@ -1,5 +1,5 @@
/*
- * linux/arch/m68knommu/platform/68328/entry.S
+ * entry.S -- non-mmu 68000 interrupt and exception entry points
*
* Copyright (C) 1991, 1992 Linus Torvalds
*
diff --git a/arch/m68k/68360/Makefile b/arch/m68k/68360/Makefile
index f6f4343..591ce42 100644
--- a/arch/m68k/68360/Makefile
+++ b/arch/m68k/68360/Makefile
@@ -1,5 +1,5 @@
#
-# Makefile for arch/m68knommu/platform/68360.
+# Makefile for 68360 machines.
#
model-y := ram
model-$(CONFIG_ROMKERNEL) := rom
diff --git a/arch/m68k/68360/config.c b/arch/m68k/68360/config.c
index d493ac4..17ec416 100644
--- a/arch/m68k/68360/config.c
+++ b/arch/m68k/68360/config.c
@@ -1,5 +1,5 @@
/*
- * linux/arch/m68knommu/platform/68360/config.c
+ * config.c - non-mmu 68360 platform initialization code
*
* Copyright (c) 2000 Michael Leslie <mleslie@lineo.com>
* Copyright (C) 1993 Hamish Macdonald
diff --git a/arch/m68k/68360/entry.S b/arch/m68k/68360/entry.S
index 447c33e..22eb302 100644
--- a/arch/m68k/68360/entry.S
+++ b/arch/m68k/68360/entry.S
@@ -1,5 +1,5 @@
/*
- * linux/arch/m68knommu/platform/68360/entry.S
+ * entry.S - non-mmu 68360 interrupt and exceptions entry points
*
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2001 SED Systems, a Division of Calian Ltd.
diff --git a/arch/m68k/68360/head-ram.S b/arch/m68k/68360/head-ram.S
index acd2131..62bc56f 100644
--- a/arch/m68k/68360/head-ram.S
+++ b/arch/m68k/68360/head-ram.S
@@ -1,6 +1,5 @@
-/* arch/m68knommu/platform/68360/head-ram.S
- *
- * Startup code for Motorola 68360
+/*
+ * head-ram.S - startup code for Motorola 68360
*
* Copyright 2001 (C) SED Systems, a Division of Calian Ltd.
* Based on: arch/m68knommu/platform/68328/pilot/crt0_rom.S
diff --git a/arch/m68k/68360/head-rom.S b/arch/m68k/68360/head-rom.S
index dfc756d..b3a7e40 100644
--- a/arch/m68k/68360/head-rom.S
+++ b/arch/m68k/68360/head-rom.S
@@ -1,6 +1,5 @@
-/* arch/m68knommu/platform/68360/head-rom.S
- *
- * Startup code for Motorola 68360
+/*
+ * head-rom.S - startup code for Motorola 68360
*
* Copyright (C) SED Systems, a Division of Calian Ltd.
* Based on: arch/m68knommu/platform/68328/pilot/crt0_rom.S
diff --git a/arch/m68k/68360/ints.c b/arch/m68k/68360/ints.c
index 8cd4269..2360fc0 100644
--- a/arch/m68k/68360/ints.c
+++ b/arch/m68k/68360/ints.c
@@ -1,5 +1,5 @@
/*
- * linux/arch/$(ARCH)/platform/$(PLATFORM)/ints.c
+ * ints.c - first level interrupt handlers
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of this archive
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/4] m68k: move non-mmu 68000 platform code
2014-08-21 13:24 [PATCH 1/4] m68k: move non-mmu 68000 platform code gerg
` (2 preceding siblings ...)
2014-08-21 13:24 ` [PATCH 4/4] m68k: fix crufty 68000 and 68360 intro comments gerg
@ 2014-08-21 13:32 ` Geert Uytterhoeven
2014-08-21 23:49 ` Greg Ungerer
3 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2014-08-21 13:32 UTC (permalink / raw)
To: Greg Ungerer; +Cc: Linux/m68k
On Thu, Aug 21, 2014 at 3:24 PM, <gerg@uclinux.org> wrote:
> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
All 4 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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/4] m68k: move non-mmu 68000 platform code
2014-08-21 13:32 ` [PATCH 1/4] m68k: move non-mmu 68000 platform code Geert Uytterhoeven
@ 2014-08-21 23:49 ` Greg Ungerer
2014-08-22 6:55 ` Geert Uytterhoeven
0 siblings, 1 reply; 7+ messages in thread
From: Greg Ungerer @ 2014-08-21 23:49 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Linux/m68k
On 21/08/14 23:32, Geert Uytterhoeven wrote:
> On Thu, Aug 21, 2014 at 3:24 PM, <gerg@uclinux.org> wrote:
>> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
>
> All 4 of this series:
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Thanks Geert.
Are you happy for these to go via the m68knommu tree?
Regards
Greg
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/4] m68k: move non-mmu 68000 platform code
2014-08-21 23:49 ` Greg Ungerer
@ 2014-08-22 6:55 ` Geert Uytterhoeven
0 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2014-08-22 6:55 UTC (permalink / raw)
To: Greg Ungerer; +Cc: Linux/m68k
Hi Greg,
On Fri, Aug 22, 2014 at 1:49 AM, Greg Ungerer <gerg@uclinux.org> wrote:
> On 21/08/14 23:32, Geert Uytterhoeven wrote:
>>
>> On Thu, Aug 21, 2014 at 3:24 PM, <gerg@uclinux.org> wrote:
>>>
>>> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
>>
>>
>> All 4 of this series:
>> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
>
> Thanks Geert.
> Are you happy for these to go via the m68knommu tree?
Sure. Thanks!
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
^ permalink raw reply [flat|nested] 7+ messages in thread