[uClinux-dev] [PATCH] Platform code merge for 68000 core cpus (part2)
Hi Greg,
I'm sending the patch for the 68000 core code merge to add in the 'for-next'
branch.
Regards,
Luis Alves
Signed-off-by: Luis Alves
---
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 -
19 files changed, 267 insertions(+), 623 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
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 7636751..2f02acf 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_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/
diff --git a/arch/m68k/platform/68000/Makefile
b/arch/m68k/platform/68000/Makefile
new file mode 100644
index 000..1eab70c
--- /dev/null
+++ b/arch/m68k/platform/68000/Makefile
@@ -0,0 +1,18 @@
+##
+#
+# Makefile for 68000 core based cpus
+#
+# 2012.10.21, Luis Alves
+# 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
diff --git a/arch/m68k/platform/68VZ328/bootlogo.h
b/arch/m68k/platform/68000/bootlogo-vz.h
similarity index 100%
rename from arch/m68k/platform/68VZ328/bootlogo.h
rename to arch/m68k/platform/68000/bootlogo-vz.h
diff --git a/arch/m68k/platform/68328/bootlogo.h
b/arch/m68k/platform/68000/bootlogo.h
similarity index 100%
rename from arch/m68k/platform/68328/bootlogo.h
rename to arch/m68k/platform/68000/bootlogo.h
diff --git a/arch/m68k/platform/68328/entry.S b/arch/m68k/platform/68000/entry.S
similarity index 100%
rename from arch/m68k/platform/68328/entry.S
rename to
Re: [uClinux-dev] [PATCH] Platform code merge for 68000 core cpus
On Tue, Oct 23, 2012 at 2:52 AM, Luis Alves wrote:
> --- a/arch/m68k/Kconfig.cpu
> +++ b/arch/m68k/Kconfig.cpu
> @@ -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
This needs a "depends on !MMU".
Else allmodconfig will select it, causing -m68000 to be passed to the assembler,
which may break the build depending on your version of binutils, a.o.
arch/m68k/kernel/entry.S:186: Error: invalid instruction for this
architecture; needs 68020 or higher (68020 [68k, 68ec020], 68030
[68ec030], 68040 [68ec040], 68060 [68ec060]) -- statement `bfextu
%sp@(50){#0,#4},%d0' ignored
arch/m68k/kernel/entry.S:211: Error: invalid operand mode for this
architecture; needs 68020 or higher -- statement `jbsr
@(sys_call_table,%d0:l:4)@(0)' ignored
Cfr. http://kisskb.ellerman.id.au/kisskb/buildresult/7416877/
BTW, it didn't break the build on my ancient workhorse binutils, but that's no
guarantee it would boot...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@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
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
Re: [uClinux-dev] [PATCH] Platform code merge for 68000 core cpus
Hi Luis,
On 24/10/12 09:45, Luis Alves wrote:
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
Signed-off-by: Luis Alves
---
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
--
Greg Ungerer -- Principal EngineerEMAIL: g...@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, AustraliaWEB: http://www.SnapGear.com
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
[uClinux-dev] [PATCH] 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
---
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
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index c4eb79e..aad3b0b 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -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
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 7636751..2f02acf 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_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/
diff --git a/arch/m68k/platform/68000/Makefile
b/arch/m68k/platform/68000/Makefile
new file mode 100644
index 000..1eab70c
--- /dev/null
+++ b/arch/m68k/platform/68000/Makefile
@@ -0,0 +1,18 @@
+##
+#
+# Makefile for 68000 core based cpus
+#
+# 2012.10.21, Luis Alves
+# 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
diff --git a/arch/m68k/platform/68VZ328/bootlogo.h
b/arch/m68k/platform/
Re: [uClinux-dev] [PATCH] Platform code merge for 68000 core cpus
Hi Greg, Please ignore this patch also. I've detected some errors in the head.S file (due to the linker script changes - _bss is now _bss_stop ). I'll fix those and build a kernel to fully test these changes. Sorry for the incovenience, Luis ___ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev
[uClinux-dev] [PATCH] Platform code merge for 68000 core cpus
Hi,
I think I've fixed all those minor issues.
Also, following the same scheme as in the coldfire directory, I've renamed
cpu specific files to match the cpu name.
Regards,
Luis
Signed-off-by: Luis Alves
---
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
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index c4eb79e..aad3b0b 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -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
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 7636751..2f02acf 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_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/
diff --git a/arch/m68k/platform/68000/Makefile
b/arch/m68k/platform/68000/Makefile
new file mode 100644
index 000..1eab70c
--- /dev/null
+++ b/arch/m68k/platform/68000/Makefile
@@ -0,0 +1,18 @@
+##
+#
+# Makefile for 68000 core based cpus
+#
+# 2012.10.21, Luis Alves
+# 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
diff --git a/arch/m68k/platform/68VZ328/bootlogo.h
b/arch/m68k/platform/68000/bootlogo-vz.h
simil
Re: [uClinux-dev] [PATCH] Platform code merge for 68000 core cpus
Hi Greg, Thanks for the review! I'll get those fixed later tonight and re-send the patch. Regards, Luis ___ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev
Re: [uClinux-dev] [PATCH] Platform code merge for 68000 core cpus
Hi Luis, On 23/10/12 10:52, Luis Alves wrote: Finnaly I've found some time to get back to the 68k. This patch merges all 68000 core cpus in one directory. Patch was generated using -B and -M and checked with scricts/checkpatch.pl It doesn't include the MC68000 code. I expect the next patch to include the 68k board definition and mc68000 related code. Also I expect to merge all entry*.S into a single file. This looks pretty good. I am happy with the way the common 68000 code all falls out. Nice.It sure is a big patch on its own though. Couple of minor things I single out below. And they are just minor. Signed-off-by: Luis Alves diff --git a/arch/m68k/platform/68000/Makefile b/arch/m68k/platform/68000/Makefile new file mode 100644 index 000..e1777ee --- /dev/null +++ b/arch/m68k/platform/68000/Makefile @@ -0,0 +1,23 @@ +## +# +# Makefile for arch/m68k/platform/68000 +# +# 2012.10.21, Luis Alves +# Merged all 68000 based cpu's configuration +# files into a single directory. +# + +# 68328, 68EZ328, 68VZ328 + +obj-y += entry.o ints.o timers.o +obj-$(CONFIG_M68328) += config.o +obj-$(CONFIG_M68EZ328) += config-ez.o +obj-$(CONFIG_M68VZ328) += config-vz.o +obj-$(CONFIG_ROM) += romvec.o + +model-y:= ram +model-$(CONFIG_ROMKERNEL) := rom Is this model-* still needed? diff --git a/arch/m68k/platform/68328/config.c b/arch/m68k/platform/68000/config.c similarity index 100% rename from arch/m68k/platform/68328/config.c rename to arch/m68k/platform/68000/config.c diff --git a/arch/m68k/platform/68328/entry.S b/arch/m68k/platform/68000/entry.S similarity index 100% rename from arch/m68k/platform/68328/entry.S rename to arch/m68k/platform/68000/entry.S diff --git a/arch/m68k/platform/68000/head.S b/arch/m68k/platform/68000/head.S new file mode 100644 index 000..6e0e2de --- /dev/null +++ b/arch/m68k/platform/68000/head.S @@ -0,0 +1,317 @@ +/* + * linux/arch/m68k/platform/68000/head.S Having the full path name here is mostly frowned upon these days. It eventually goes stale, if/when files get moved. + * + * Common startup code for 68000 core based CPU's + * + * 2012.10.21, Luis Alves , Single head.S file for all + * 68000 core based CPU's. Based on the sources from: + * Coldfire by Greg Ungerer + * 68328 by D. Jeff Dionne , + * Kenneth Albanowski , + * The Silver Hammer Group, Ltd. + * + */ + +#include +#include +#include +#include + + +/* + * + * UCSIMM and UCDIMM use CONFIG_MEMORY_RESERVE to reserve some RAM + * + */ + +#ifdef CONFIG_MEMORY_RESERVE +#define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE) - (CONFIG_MEMORY_RESERVE * 0x10) +#else +#define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE) +#endif + +/*/ + +.global_start +.global _rambase +.global _ramvec +.global_ramstart +.global_ramend Inconsistent indenting? +#if defined(CONFIG_PILOT) || defined(CONFIG_INIT_LCD) +.global bootlogo_bits +#endif + +/* Defining DEBUG_HEAD_CODE, serial port in 68x328 is inited */ +#undef DEBUG_HEAD_CODE +//#define DEBUG_HEAD_CODE No use of '//' for comments please :-) +.data + +/* + * + * RAM setup pointers. Used by the kernel to determine RAM location and size. + * + */ + +_rambase: + .long 0 +_ramvec: + .long 0 +_ramstart: + .long 0 +_ramend: + .long 0 + + +__HEAD + + +/* + * + * Entry point, where all begins! + * + */ + +_start: + + +/* + * + * Pilot need this specific signature at the start of ROM + * + */ + +#ifdef CONFIG_PILOT + .byte 0x4e, 0xfa, 0x00, 0x0a /* bra opcode (jump 10 bytes ahead) */ + .byte 'b', 'o', 'o', 't' + .word 1 + nop + moveq #0, %d0 + movew %d0, 0xf618 /* Watchdog off */ + movel #0x00011f07, 0xf114 /* CS A1 Mask */ +#endif /* CONFIG_PILOT */ + + + movew #0x2700, %sr/* disable all interrupts */ + + +/* + * + * Setup PLL and wait for it to settle (in 68x328 cpu's). + * Also, if enabled, init serial port. + * + *
[uClinux-dev] [PATCH] Platform code merge for 68000 core cpus
Hi all,
Finnaly I've found some time to get back to the 68k.
This patch merges all 68000 core cpus in one directory.
Patch was generated using -B and -M and checked with
scricts/checkpatch.pl
It doesn't include the MC68000 code. I expect the next
patch to include the 68k board definition and mc68000
related code.
Also I expect to merge all entry*.S into a single file.
Regards,
Luis
Signed-off-by: Luis Alves
---
arch/m68k/Kconfig.cpu |2 +-
arch/m68k/Makefile |6 +-
arch/m68k/platform/68000/Makefile | 23 ++
.../{68VZ328/bootlogo.h => 68000/bootlogo-vz.h}|0
arch/m68k/platform/{68328 => 68000}/bootlogo.h |0
.../{68EZ328/config.c => 68000/config-ez.c}|0
.../{68VZ328/config.c => 68000/config-vz.c}|2 +-
arch/m68k/platform/{68328 => 68000}/config.c |0
arch/m68k/platform/{68328 => 68000}/entry.S|0
arch/m68k/platform/68000/head.S| 318
arch/m68k/platform/{68328 => 68000}/ints.c |0
arch/m68k/platform/{68328 => 68000}/romvec.S |0
arch/m68k/platform/{68328 => 68000}/timers.c |0
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, 345 insertions(+), 618 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/{68EZ328/config.c => 68000/config-ez.c} (100%)
rename arch/m68k/platform/{68VZ328/config.c => 68000/config-vz.c} (99%)
rename arch/m68k/platform/{68328 => 68000}/config.c (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 (100%)
rename arch/m68k/platform/{68328 => 68000}/romvec.S (100%)
rename arch/m68k/platform/{68328 => 68000}/timers.c (100%)
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
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index c4eb79e..aad3b0b 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -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
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 7636751..2f02acf 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_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/
diff --git a/arch/m68k/platform/68000/Makefile
b/arch/m68k/platform/68000/Makefile
new file mode 100644
index 000..e1777ee
--- /dev/null
+++ b/arch/m68k/platform/68000/Makefile
@@ -0,0 +1,23 @@
+##
+#
+# Makefile for arch/m68k/platform/68000
+#
+# 2012.10.21, Luis Alves
+# Merged all 68000 based cpu's configuration
+# files into a single directory.
+#
+
+# 68328, 68EZ328, 68VZ328
+
+obj-y += entry.o ints.o timers.o
+obj-$(CONFIG_M68328) += config.o
+obj-$(CONFIG_M68EZ328) += config
