g***@uclinux.org
2014-08-21 13:24:13 UTC
From: Greg Ungerer <***@uclinux.org>
The non-mmu 68000 specific code is inconsistently placed under a directory
named "platform". Move it to arch/m68k/ along with the other platform and
machine directories.
Signed-off-by: Greg Ungerer <***@uclinux.org>
---
arch/m68k/{platform => }/68000/Makefile | 0
arch/m68k/{platform => }/68000/bootlogo-vz.h | 0
arch/m68k/{platform => }/68000/bootlogo.h | 0
arch/m68k/{platform => }/68000/entry.S | 0
arch/m68k/{platform => }/68000/head.S | 0
arch/m68k/{platform => }/68000/ints.c | 0
arch/m68k/{platform => }/68000/m68328.c | 0
arch/m68k/{platform => }/68000/m68EZ328.c | 0
arch/m68k/{platform => }/68000/m68VZ328.c | 0
arch/m68k/{platform => }/68000/romvec.S | 0
arch/m68k/{platform => }/68000/timers.c | 0
arch/m68k/Makefile | 4 ++--
12 files changed, 2 insertions(+), 2 deletions(-)
rename arch/m68k/{platform => }/68000/Makefile (100%)
rename arch/m68k/{platform => }/68000/bootlogo-vz.h (100%)
rename arch/m68k/{platform => }/68000/bootlogo.h (100%)
rename arch/m68k/{platform => }/68000/entry.S (100%)
rename arch/m68k/{platform => }/68000/head.S (100%)
rename arch/m68k/{platform => }/68000/ints.c (100%)
rename arch/m68k/{platform => }/68000/m68328.c (100%)
rename arch/m68k/{platform => }/68000/m68EZ328.c (100%)
rename arch/m68k/{platform => }/68000/m68VZ328.c (100%)
rename arch/m68k/{platform => }/68000/romvec.S (100%)
rename arch/m68k/{platform => }/68000/timers.c (100%)
diff --git a/arch/m68k/platform/68000/Makefile b/arch/m68k/68000/Makefile
similarity index 100%
rename from arch/m68k/platform/68000/Makefile
rename to arch/m68k/68000/Makefile
diff --git a/arch/m68k/platform/68000/bootlogo-vz.h b/arch/m68k/68000/bootlogo-vz.h
similarity index 100%
rename from arch/m68k/platform/68000/bootlogo-vz.h
rename to arch/m68k/68000/bootlogo-vz.h
diff --git a/arch/m68k/platform/68000/bootlogo.h b/arch/m68k/68000/bootlogo.h
similarity index 100%
rename from arch/m68k/platform/68000/bootlogo.h
rename to arch/m68k/68000/bootlogo.h
diff --git a/arch/m68k/platform/68000/entry.S b/arch/m68k/68000/entry.S
similarity index 100%
rename from arch/m68k/platform/68000/entry.S
rename to arch/m68k/68000/entry.S
diff --git a/arch/m68k/platform/68000/head.S b/arch/m68k/68000/head.S
similarity index 100%
rename from arch/m68k/platform/68000/head.S
rename to arch/m68k/68000/head.S
diff --git a/arch/m68k/platform/68000/ints.c b/arch/m68k/68000/ints.c
similarity index 100%
rename from arch/m68k/platform/68000/ints.c
rename to arch/m68k/68000/ints.c
diff --git a/arch/m68k/platform/68000/m68328.c b/arch/m68k/68000/m68328.c
similarity index 100%
rename from arch/m68k/platform/68000/m68328.c
rename to arch/m68k/68000/m68328.c
diff --git a/arch/m68k/platform/68000/m68EZ328.c b/arch/m68k/68000/m68EZ328.c
similarity index 100%
rename from arch/m68k/platform/68000/m68EZ328.c
rename to arch/m68k/68000/m68EZ328.c
diff --git a/arch/m68k/platform/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c
similarity index 100%
rename from arch/m68k/platform/68000/m68VZ328.c
rename to arch/m68k/68000/m68VZ328.c
diff --git a/arch/m68k/platform/68000/romvec.S b/arch/m68k/68000/romvec.S
similarity index 100%
rename from arch/m68k/platform/68000/romvec.S
rename to arch/m68k/68000/romvec.S
diff --git a/arch/m68k/platform/68000/timers.c b/arch/m68k/68000/timers.c
similarity index 100%
rename from arch/m68k/platform/68000/timers.c
rename to arch/m68k/68000/timers.c
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 2e24775..dd96fc2 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -93,7 +93,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_M68000) := arch/m68k/platform/68000/head.o
+head-$(CONFIG_M68000) := arch/m68k/68000/head.o
head-$(CONFIG_COLDFIRE) := arch/m68k/coldfire/head.o
core-y += arch/m68k/kernel/ arch/m68k/mm/
@@ -115,7 +115,7 @@ 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_M68000) += arch/m68k/platform/68000/
+core-$(CONFIG_M68000) += arch/m68k/68000/
core-$(CONFIG_COLDFIRE) += arch/m68k/coldfire/
The non-mmu 68000 specific code is inconsistently placed under a directory
named "platform". Move it to arch/m68k/ along with the other platform and
machine directories.
Signed-off-by: Greg Ungerer <***@uclinux.org>
---
arch/m68k/{platform => }/68000/Makefile | 0
arch/m68k/{platform => }/68000/bootlogo-vz.h | 0
arch/m68k/{platform => }/68000/bootlogo.h | 0
arch/m68k/{platform => }/68000/entry.S | 0
arch/m68k/{platform => }/68000/head.S | 0
arch/m68k/{platform => }/68000/ints.c | 0
arch/m68k/{platform => }/68000/m68328.c | 0
arch/m68k/{platform => }/68000/m68EZ328.c | 0
arch/m68k/{platform => }/68000/m68VZ328.c | 0
arch/m68k/{platform => }/68000/romvec.S | 0
arch/m68k/{platform => }/68000/timers.c | 0
arch/m68k/Makefile | 4 ++--
12 files changed, 2 insertions(+), 2 deletions(-)
rename arch/m68k/{platform => }/68000/Makefile (100%)
rename arch/m68k/{platform => }/68000/bootlogo-vz.h (100%)
rename arch/m68k/{platform => }/68000/bootlogo.h (100%)
rename arch/m68k/{platform => }/68000/entry.S (100%)
rename arch/m68k/{platform => }/68000/head.S (100%)
rename arch/m68k/{platform => }/68000/ints.c (100%)
rename arch/m68k/{platform => }/68000/m68328.c (100%)
rename arch/m68k/{platform => }/68000/m68EZ328.c (100%)
rename arch/m68k/{platform => }/68000/m68VZ328.c (100%)
rename arch/m68k/{platform => }/68000/romvec.S (100%)
rename arch/m68k/{platform => }/68000/timers.c (100%)
diff --git a/arch/m68k/platform/68000/Makefile b/arch/m68k/68000/Makefile
similarity index 100%
rename from arch/m68k/platform/68000/Makefile
rename to arch/m68k/68000/Makefile
diff --git a/arch/m68k/platform/68000/bootlogo-vz.h b/arch/m68k/68000/bootlogo-vz.h
similarity index 100%
rename from arch/m68k/platform/68000/bootlogo-vz.h
rename to arch/m68k/68000/bootlogo-vz.h
diff --git a/arch/m68k/platform/68000/bootlogo.h b/arch/m68k/68000/bootlogo.h
similarity index 100%
rename from arch/m68k/platform/68000/bootlogo.h
rename to arch/m68k/68000/bootlogo.h
diff --git a/arch/m68k/platform/68000/entry.S b/arch/m68k/68000/entry.S
similarity index 100%
rename from arch/m68k/platform/68000/entry.S
rename to arch/m68k/68000/entry.S
diff --git a/arch/m68k/platform/68000/head.S b/arch/m68k/68000/head.S
similarity index 100%
rename from arch/m68k/platform/68000/head.S
rename to arch/m68k/68000/head.S
diff --git a/arch/m68k/platform/68000/ints.c b/arch/m68k/68000/ints.c
similarity index 100%
rename from arch/m68k/platform/68000/ints.c
rename to arch/m68k/68000/ints.c
diff --git a/arch/m68k/platform/68000/m68328.c b/arch/m68k/68000/m68328.c
similarity index 100%
rename from arch/m68k/platform/68000/m68328.c
rename to arch/m68k/68000/m68328.c
diff --git a/arch/m68k/platform/68000/m68EZ328.c b/arch/m68k/68000/m68EZ328.c
similarity index 100%
rename from arch/m68k/platform/68000/m68EZ328.c
rename to arch/m68k/68000/m68EZ328.c
diff --git a/arch/m68k/platform/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c
similarity index 100%
rename from arch/m68k/platform/68000/m68VZ328.c
rename to arch/m68k/68000/m68VZ328.c
diff --git a/arch/m68k/platform/68000/romvec.S b/arch/m68k/68000/romvec.S
similarity index 100%
rename from arch/m68k/platform/68000/romvec.S
rename to arch/m68k/68000/romvec.S
diff --git a/arch/m68k/platform/68000/timers.c b/arch/m68k/68000/timers.c
similarity index 100%
rename from arch/m68k/platform/68000/timers.c
rename to arch/m68k/68000/timers.c
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 2e24775..dd96fc2 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -93,7 +93,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_M68000) := arch/m68k/platform/68000/head.o
+head-$(CONFIG_M68000) := arch/m68k/68000/head.o
head-$(CONFIG_COLDFIRE) := arch/m68k/coldfire/head.o
core-y += arch/m68k/kernel/ arch/m68k/mm/
@@ -115,7 +115,7 @@ 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_M68000) += arch/m68k/platform/68000/
+core-$(CONFIG_M68000) += arch/m68k/68000/
core-$(CONFIG_COLDFIRE) += arch/m68k/coldfire/
--
1.9.1
1.9.1