diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-03-21 23:39:27 -0400 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-03-25 00:05:13 -0400 |
| commit | 66d857b08b8c3ed5c72c361f863cce77d2a978d7 (patch) | |
| tree | 47222d86f4d78dc0da31baf64188bd2e4b38ac1e /arch/m68k/lib/Makefile | |
| parent | d39dd11c3e6a7af5c20bfac40594db36cf270f42 (diff) | |
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>
Diffstat (limited to 'arch/m68k/lib/Makefile')
| -rw-r--r-- | arch/m68k/lib/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile index af9abf8d9d98..1f95881d8437 100644 --- a/arch/m68k/lib/Makefile +++ b/arch/m68k/lib/Makefile | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | # | 1 | ifdef CONFIG_MMU |
| 2 | # Makefile for m68k-specific library files.. | 2 | include arch/m68k/lib/Makefile_mm |
| 3 | # | 3 | else |
| 4 | 4 | include arch/m68k/lib/Makefile_no | |
| 5 | lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ | 5 | endif |
| 6 | checksum.o string.o uaccess.o | ||