linux/arch/m68k/lib
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
..
ashldi3.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ashrdi3.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
checksum_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
checksum_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
checksum.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
delay.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
divsi3.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
lshrdi3.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07: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
memcpy.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
memmove.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
memset.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
modsi3.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
muldi3_mm.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
muldi3_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
muldi3.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
mulsi3.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
string.c m68k: remove arch specific non-optimized memcmp() 2011-02-16 09:42:24 +10:00
uaccess.c m68k: implement __clear_user() 2007-05-15 08:54:00 -07:00
udivsi3.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
umodsi3.S m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00