linux-stable.git/arch/m68k/kernel/Makefile, branch linux-3.7.y

m68k: common PCI support definitions and code

2012-07-17T05:49:41+00:00

Basic set of definitions and support code required to turn on CONFIG_PCI
for the m68k architecture. Nothing specific to any PCI implementation in
any m68k class CPU hardware yet.

Signed-off-by: Greg Ungerer 
Acked-by: Geert Uytterhoeven

m68k: Use generic init_task

2012-05-05T11:00:23+00:00

Same code. Use the generic version.

Signed-off-by: Thomas Gleixner 
Cc: Geert Uytterhoeven 
Link: http://lkml.kernel.org/r/20120503085034.816195285@linutronix.de

m68k: do not use m68k startup or interrupt code for ColdFire CPUs

2011-12-30T00:20:48+00:00

The ColdFire CPUs have their own startup and interrupt code (in the
platform/coldfire directory), and do not use the general m68k startup and
interrupt code. In fact the use of the arch/m68k/kernel/head.o is not about
CONFIG_MMU or not, it is really about the machine type we are compiling for.

Modify the selection and use of head.o to be based on the machine type.
Only select the local ints.o and vectors.o code if we are using the classic
68k CPU types (that use the conventional Morotola MMU or SUN3 MMU).

Signed-off-by: Greg Ungerer 
Acked-by: Matt Waddel 
Acked-by: Kurt Mahan

m68k: merge the init_task code for mmu and non-mmu targets

2011-12-24T11:47:56+00:00

The init_task code can be the same for both mmu and non-mmu targets.
None of the alignment carried out in the the current init_task code
is necessary. The linker script takes care of aligning the init_thread
structure to a THREAD SIZE boundary, and that is all we need.

So use the init_task.c code for all target types, that makes m68k
code consistent with what most other architectures do.

Signed-off-by: Greg Ungerer 
Acked-by: Geert Uytterhoeven

m68k/irq: Remove obsolete m68k irq framework

2011-11-08T21:35:52+00:00

Signed-off-by: Geert Uytterhoeven

m68k/irq: Add genirq support

2011-11-08T21:35:49+00:00

Disabled on all platforms for now

Signed-off-by: Geert Uytterhoeven 
[v1] Acked-by: Thomas Gleixner

m68k: move hardware vector setting from traps.c to its own file

2011-10-18T04:22:25+00:00

Most of the trap.c code is general to all m68k arch members. But the code
it currently contains to set the hardware vector table is quite specific to
the 680x0 family. They can have the vector table at any address unlike
other family members (which either support only a single fixed address,
or a limited range of addresses). So lets move that code out to a new file,
vectors.c. This will make sharing the rest of the trap.c code easier and
cleaner.

Signed-off-by: Greg Ungerer

m68k: merge the mmu and non-mmu kernel/Makefiles

2011-10-18T04:22:25+00:00

The few differences between the mmu and non-mmu kernel/Makefiles can
easily be handled inside of a single Makefile. Merge the 2 back into
a single Makefile.

Signed-off-by: Greg Ungerer 
Acked-by: Sam Ravnborg

m68k: merge m68k and m68knommu arch directories

2011-03-25T04:05:13+00:00

There is a lot of common code that could be shared between the m68k
and m68knommu arch branches. It makes sense to merge the two branches
into a single directory structure so that we can more easily share
that common code.

This is a brute force merge, based on a script from Stephen King
, which was originally written by Arnd Bergmann
.

> The script was inspired by the script Sam Ravnborg used to merge the
> includes from m68knommu. For those files common to both arches but
> differing in content, the m68k version of the file is renamed to
> _mm. and the m68knommu version of the file is moved into the
> corresponding m68k directory and renamed _no. and a small
> wrapper file . is used to select between the two version. Files
> that are common to both but don't differ are removed from the m68knommu
> tree and files and directories that are unique to the m68knommu tree are
> moved to the m68k tree. Finally, the arch/m68knommu tree is removed.
>
> To select between the the versions of the files, the wrapper uses
>
> #ifdef CONFIG_MMU
> #include _mm.
> #else
> #include _no.
> #endif

On top of this file merge I have done a simplistic merge of m68k and
m68knommu Kconfig, which primarily attempts to keep existing options and
menus in place. Other than a handful of options being moved it produces
identical .config outputs on m68k and m68knommu targets I tested it on.

With this in place there is now quite a bit of scope for merge cleanups
in future patches.

Signed-off-by: Greg Ungerer

m68k: remove the dead PCI code

2008-10-14T17:23:27+00:00

This patch removes the no longer used m68k PCI code.

Signed-off-by: Adrian Bunk 
Signed-off-by: Geert Uytterhoeven 
Signed-off-by: Linus Torvalds