linux/arch/m68k/kernel
Greg Ungerer 66d857b08b m68k: merge m68k and m68knommu arch directories
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
<sfking@fdwdc.com>, which was originally written by Arnd Bergmann
<arnd@arndb.de>.

> 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
> <file>_mm.<ext> and the m68knommu version of the file is moved into the
> corresponding m68k directory and renamed <file>_no.<ext> and a small
> wrapper file <file>.<ext> 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 <file>_mm.<ext>
> #else
> #include <file>_no.<ext>
> #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 <gerg@uclinux.org>
2011-03-25 14:05:13 +10:00
..
.gitignore
asm-offsets_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
asm-offsets_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
asm-offsets.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
dma_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
dma_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
dma.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
entry_mm.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
entry_no.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
entry.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
head.S
init_task.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
ints.c
irq.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
m68k_ksyms_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
m68k_ksyms_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
m68k_ksyms.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
Makefile m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
Makefile_mm m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
Makefile_no m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
module_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
module_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
module.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
module.lds
process_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
process_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
process.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
ptrace_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
ptrace_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
ptrace.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
setup_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
setup_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
setup.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
signal_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
signal_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
signal.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
sun3-head.S
sys_m68k_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
sys_m68k_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
sys_m68k.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
syscalltable.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
time_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
time_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
time.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
traps_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
traps_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
traps.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
vmlinux-std.lds
vmlinux-sun3.lds
vmlinux.lds_mm.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
vmlinux.lds_no.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
vmlinux.lds.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00