Platform code merge for 68000 core cpus

PATCH In review Luis Alves 2 participants 2 messages Oct 23, 2012 – Oct 24, 2012 m68k architecture

lore

Share & tools

lore

Luis Alves

author

2012-10-23 23:45 UTC #0 lore raw

PATCH 1/1 Platform code merge for 68000 core cpus

Hello again,

I've fixed the previous issue.

As a test I've built a kernel for the 68000 based on the git sources with this patch and everything went smooth. (Tested it in real hardware)

Regards,
Luis

Signed-off-by Luis Alves <[email protected]>

---
 arch/m68k/Kconfig.cpu                              |    2 +-
 arch/m68k/Makefile                                 |    6 +-
 arch/m68k/platform/68000/Makefile                  |   18 ++
 .../{68VZ328/bootlogo.h => 68000/bootlogo-vz.h}    |    0
 arch/m68k/platform/{68328 => 68000}/bootlogo.h     |    0
 arch/m68k/platform/{68328 => 68000}/entry.S        |    0
 arch/m68k/platform/68000/head.S                    |  240 ++++++++++++++++++++
 arch/m68k/platform/{68328 => 68000}/ints.c         |    2 +-
 .../platform/{68328/config.c => 68000/m68328.c}    |    2 +-
 .../{68EZ328/config.c => 68000/m68EZ328.c}         |    2 +-
 .../{68VZ328/config.c => 68000/m68VZ328.c}         |    4 +-
 arch/m68k/platform/{68328 => 68000}/romvec.S       |    2 +-
 arch/m68k/platform/{68328 => 68000}/timers.c       |    2 +-
 arch/m68k/platform/68328/Makefile                  |   21 --
 arch/m68k/platform/68328/head-de2.S                |  128 -----------
 arch/m68k/platform/68328/head-pilot.S              |  207 -----------------
 arch/m68k/platform/68328/head-ram.S                |  141 ------------
 arch/m68k/platform/68328/head-rom.S                |  105 ---------
 arch/m68k/platform/68EZ328/Makefile                |    5 -
 arch/m68k/platform/68VZ328/Makefile                |    5 -
 20 files changed, 268 insertions(+), 624 deletions(-)
 create mode 100644 arch/m68k/platform/68000/Makefile
 rename arch/m68k/platform/{68VZ328/bootlogo.h => 68000/bootlogo-vz.h} (100%)
 rename arch/m68k/platform/{68328 => 68000}/bootlogo.h (100%)
 rename arch/m68k/platform/{68328 => 68000}/entry.S (100%)
 create mode 100644 arch/m68k/platform/68000/head.S
 rename arch/m68k/platform/{68328 => 68000}/ints.c (98%)
 rename arch/m68k/platform/{68328/config.c => 68000/m68328.c} (97%)
 rename arch/m68k/platform/{68EZ328/config.c => 68000/m68EZ328.c} (97%)
 rename arch/m68k/platform/{68VZ328/config.c => 68000/m68VZ328.c} (98%)
 rename arch/m68k/platform/{68328 => 68000}/romvec.S (94%)
 rename arch/m68k/platform/{68328 => 68000}/timers.c (98%)
 delete mode 100644 arch/m68k/platform/68328/Makefile
 delete mode 100644 arch/m68k/platform/68328/head-de2.S
 delete mode 100644 arch/m68k/platform/68328/head-pilot.S
 delete mode 100644 arch/m68k/platform/68328/head-ram.S
 delete mode 100644 arch/m68k/platform/68328/head-rom.S
 delete mode 100644 arch/m68k/platform/68EZ328/Makefile
 delete mode 100644 arch/m68k/platform/68VZ328/Makefile

arch/m68k/Kconfig.cpu +1 -1

index c4eb79e..aad3b0b 100644
@@ -35,7 +35,7 @@ endchoice
 if M68KCLASSIC
 
 config M68000
-	bool
+	bool "MC68000"
 	select CPU_HAS_NO_BITFIELDS
 	select CPU_HAS_NO_MULDIV64
 	select CPU_HAS_NO_UNALIGNED

arch/m68k/Makefile +2 -4

index 7636751..2f02acf 100644
@@ -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_M68000)		:= arch/m68k/platform/68328/head.o
+head-$(CONFIG_M68000)		:= arch/m68k/platform/68000/head.o
 head-$(CONFIG_COLDFIRE)		:= arch/m68k/platform/coldfire/head.o
 
 core-y				+= arch/m68k/kernel/	arch/m68k/mm/

@@ -114,9 +114,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/68328/
-core-$(CONFIG_M68EZ328)		+= arch/m68k/platform/68EZ328/
-core-$(CONFIG_M68VZ328)		+= arch/m68k/platform/68VZ328/
+core-$(CONFIG_M68000)		+= arch/m68k/platform/68000/
 core-$(CONFIG_COLDFIRE)		+= arch/m68k/platform/coldfire/

arch/m68k/platform/68000/Makefile new file +18 -0

new file mode 100644
index 0000000..1eab70c
@@ -0,0 +1,18 @@
+##################################################
+#
+# Makefile for 68000 core based cpus
+#
+# 2012.10.21, Luis Alves <[email protected]>
+#             Merged all 68000 based cpu's config
+#             files into a single directory.
+#
+
+# 68328, 68EZ328, 68VZ328
+
+obj-y			+= entry.o ints.o timers.o
+obj-$(CONFIG_M68328)	+= m68328.o
+obj-$(CONFIG_M68EZ328)	+= m68EZ328.o
+obj-$(CONFIG_M68VZ328)	+= m68VZ328.o
+obj-$(CONFIG_ROM)	+= romvec.o
+
+extra-y 		:= head.o

arch/m68k/platform/68000/bootlogo-vz.h renamed from arch/m68k/platform/68VZ328/bootlogo.h +0 -0

similarity index 100%
rename from arch/m68k/platform/68VZ328/bootlogo.h
rename to arch/m68k/platform/68000/bootlogo-vz.h

arch/m68k/platform/68000/bootlogo.h renamed from arch/m68k/platform/68328/bootlogo.h +0 -0

similarity index 100%
rename from arch/m68k/platform/68328/bootlogo.h
rename to arch/m68k/platform/68000/bootlogo.h

arch/m68k/platform/68000/entry.S renamed from arch/m68k/platform/68328/entry.S +0 -0

similarity index 100%
rename from arch/m68k/platform/68328/entry.S
rename to arch/m68k/platform/68000/entry.S

arch/m68k/platform/68000/head.S new file +240 -0

240 lines not on this page · raw message

arch/m68k/platform/68000/ints.c renamed from arch/m68k/platform/68328/ints.c +1 -1

similarity index 98%
rename from arch/m68k/platform/68328/ints.c
rename to arch/m68k/platform/68000/ints.c
index b3810fe..cda49b1 100644
@@ -1,5 +1,5 @@
 /*
- * linux/arch/m68knommu/platform/68328/ints.c
+ * ints.c - Generic interrupt controller support
  *
  * 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

arch/m68k/platform/68000/m68328.c renamed from arch/m68k/platform/68328/config.c +1 -1

similarity index 97%
rename from arch/m68k/platform/68328/config.c
rename to arch/m68k/platform/68000/m68328.c
index 8c20e89..a86eb66 100644
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *  linux/arch/m68knommu/platform/68328/config.c
+ *  m68328.c - 68328 specific config
  *
  *  Copyright (C) 1993 Hamish Macdonald
  *  Copyright (C) 1999 D. Jeff Dionne

arch/m68k/platform/68000/m68EZ328.c renamed from arch/m68k/platform/68EZ328/config.c +1 -1

similarity index 97%
rename from arch/m68k/platform/68EZ328/config.c
rename to arch/m68k/platform/68000/m68EZ328.c
index 4f158d5..a6eb72d 100644
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *  linux/arch/m68knommu/platform/68EZ328/config.c
+ *  m68EZ328.c - 68EZ328 specific config
  *
  *  Copyright (C) 1993 Hamish Macdonald
  *  Copyright (C) 1999 D. Jeff Dionne

arch/m68k/platform/68000/m68VZ328.c renamed from arch/m68k/platform/68VZ328/config.c +2 -2

similarity index 98%
rename from arch/m68k/platform/68VZ328/config.c
rename to arch/m68k/platform/68000/m68VZ328.c
index 2ed8dc3..eb6964f 100644
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *  linux/arch/m68knommu/platform/68VZ328/config.c
+ *  m68VZ328.c - 68VZ328 specific config
  *
  *  Copyright (C) 1993 Hamish Macdonald
  *  Copyright (C) 1999 D. Jeff Dionne

@@ -28,7 +28,7 @@
 #include <asm/bootstd.h>
 
 #ifdef CONFIG_INIT_LCD
-#include "bootlogo.h"
+#include "bootlogo-vz.h"
 #endif
 
 /***************************************************************************/

arch/m68k/platform/68000/romvec.S renamed from arch/m68k/platform/68328/romvec.S +1 -1

similarity index 94%
rename from arch/m68k/platform/68328/romvec.S
rename to arch/m68k/platform/68000/romvec.S
index 3108446..15c70cd 100644
@@ -1,5 +1,5 @@
 /*
- * linux/arch/m68knommu/platform/68328/romvec.S
+ * romvec.S - Vector table for 68000 cpus
  *
  * 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

arch/m68k/platform/68000/timers.c renamed from arch/m68k/platform/68328/timers.c +1 -1

similarity index 98%
rename from arch/m68k/platform/68328/timers.c
rename to arch/m68k/platform/68000/timers.c
index f4dc9b2..ec30acb 100644
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *  linux/arch/m68knommu/platform/68328/timers.c
+ *  timers.c - Generic hardware timer support.
  *
  *  Copyright (C) 1993 Hamish Macdonald
  *  Copyright (C) 1999 D. Jeff Dionne

arch/m68k/platform/68328/Makefile deleted +0 ~~-21~~

deleted file mode 100644
index ee61bf8..0000000
@@ -1,21 +0,0 @@
-#
-# Makefile for arch/m68knommu/platform/68328.
-#
-
-model-y			  := ram
-model-$(CONFIG_ROMKERNEL) := rom
-
-head-y			= head-$(model-y).o
-head-$(CONFIG_PILOT)	= head-pilot.o
-head-$(CONFIG_DRAGEN2)	= head-de2.o
-
-obj-y			+= entry.o ints.o timers.o
-obj-$(CONFIG_M68328)	+= config.o
-obj-$(CONFIG_ROM)	+= romvec.o
-
-extra-y			:= head.o
-
-$(obj)/head.o: $(obj)/$(head-y)
-	ln -sf $(head-y) $(obj)/head.o
-
-clean-files := $(obj)/head.o $(head-y)

arch/m68k/platform/68328/head-de2.S deleted +0 ~~-128~~

128 lines not on this page · raw message

arch/m68k/platform/68328/head-pilot.S deleted +0 ~~-207~~

207 lines not on this page · raw message

arch/m68k/platform/68328/head-ram.S deleted +0 ~~-141~~

141 lines not on this page · raw message

arch/m68k/platform/68328/head-rom.S deleted +0 ~~-105~~

105 lines not on this page · raw message

arch/m68k/platform/68EZ328/Makefile deleted +0 -5

deleted file mode 100644
index b44d799..0000000
@@ -1,5 +0,0 @@
-#
-# Makefile for arch/m68knommu/platform/68EZ328.
-#
-
-obj-y := config.o

arch/m68k/platform/68VZ328/Makefile deleted +0 -5

deleted file mode 100644
index 8166741..0000000
@@ -1,5 +0,0 @@
-#
-# Makefile for arch/m68k/platform/68VZ328.
-#
-
-obj-y		:= config.o

Signature · 1 line

1.7.10.4

Greg Ungerer

2012-10-24 05:58 UTC #1 lore raw

Hi Luis,

Quoted 3 lines · Luis Alves

I've fixed the previous issue.
As a test I've built a kernel for the 68000 based on the git sources with this patch and everything went smooth. (Tested it in real hardware)

Thanks, this looks good, cleans up all those targets nicely. Handy reduction in code size too. I have pushed this into the for-next branch of the m68knommu git tree.

Regards
Greg

Quoted 42 lines

Signed-off-by Luis Alves <[email protected]>
---
  arch/m68k/Kconfig.cpu                              |    2 +-
  arch/m68k/Makefile                                 |    6 +-
  arch/m68k/platform/68000/Makefile                  |   18 ++
  .../{68VZ328/bootlogo.h => 68000/bootlogo-vz.h}    |    0
  arch/m68k/platform/{68328 => 68000}/bootlogo.h     |    0
  arch/m68k/platform/{68328 => 68000}/entry.S        |    0
  arch/m68k/platform/68000/head.S                    |  240 ++++++++++++++++++++
  arch/m68k/platform/{68328 => 68000}/ints.c         |    2 +-
  .../platform/{68328/config.c => 68000/m68328.c}    |    2 +-
  .../{68EZ328/config.c => 68000/m68EZ328.c}         |    2 +-
  .../{68VZ328/config.c => 68000/m68VZ328.c}         |    4 +-
  arch/m68k/platform/{68328 => 68000}/romvec.S       |    2 +-
  arch/m68k/platform/{68328 => 68000}/timers.c       |    2 +-
  arch/m68k/platform/68328/Makefile                  |   21 --
  arch/m68k/platform/68328/head-de2.S                |  128 -----------
  arch/m68k/platform/68328/head-pilot.S              |  207 -----------------
  arch/m68k/platform/68328/head-ram.S                |  141 ------------
  arch/m68k/platform/68328/head-rom.S                |  105 ---------
  arch/m68k/platform/68EZ328/Makefile                |    5 -
  arch/m68k/platform/68VZ328/Makefile                |    5 -
  20 files changed, 268 insertions(+), 624 deletions(-)
create mode 100644 arch/m68k/platform/68000/Makefile
rename arch/m68k/platform/{68VZ328/bootlogo.h => 68000/bootlogo-vz.h} (100%) rename arch/m68k/platform/{68328 => 68000}/bootlogo.h (100%) rename arch/m68k/platform/{68328 => 68000}/entry.S (100%) create mode 100644 arch/m68k/platform/68000/head.S
rename arch/m68k/platform/{68328 => 68000}/ints.c (98%)
rename arch/m68k/platform/{68328/config.c => 68000/m68328.c} (97%) rename arch/m68k/platform/{68EZ328/config.c => 68000/m68EZ328.c} (97%) rename arch/m68k/platform/{68VZ328/config.c => 68000/m68VZ328.c} (98%) rename arch/m68k/platform/{68328 => 68000}/romvec.S (94%) rename arch/m68k/platform/{68328 => 68000}/timers.c (98%) delete mode 100644 arch/m68k/platform/68328/Makefile
delete mode 100644 arch/m68k/platform/68328/head-de2.S
delete mode 100644 arch/m68k/platform/68328/head-pilot.S
delete mode 100644 arch/m68k/platform/68328/head-ram.S
delete mode 100644 arch/m68k/platform/68328/head-rom.S
delete mode 100644 arch/m68k/platform/68EZ328/Makefile
delete mode 100644 arch/m68k/platform/68VZ328/Makefile

Signature · 5 lines

------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com