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>
Showing
- arch/m68k/Kconfig 33 additions, 423 deletionsarch/m68k/Kconfig
- arch/m68k/Kconfig.debug 34 additions, 0 deletionsarch/m68k/Kconfig.debug
- arch/m68k/Kconfig.mmu 417 additions, 0 deletionsarch/m68k/Kconfig.mmu
- arch/m68k/Kconfig.nommu 0 additions, 94 deletionsarch/m68k/Kconfig.nommu
- arch/m68k/Makefile 3 additions, 119 deletionsarch/m68k/Makefile
- arch/m68k/Makefile_mm 121 additions, 0 deletionsarch/m68k/Makefile_mm
- arch/m68k/Makefile_no 7 additions, 9 deletionsarch/m68k/Makefile_no
- arch/m68k/configs/m5208evb_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5208evb_defconfig
- arch/m68k/configs/m5249evb_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5249evb_defconfig
- arch/m68k/configs/m5272c3_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5272c3_defconfig
- arch/m68k/configs/m5275evb_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5275evb_defconfig
- arch/m68k/configs/m5307c3_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5307c3_defconfig
- arch/m68k/configs/m5407c3_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5407c3_defconfig
- arch/m68k/kernel/Makefile 3 additions, 15 deletionsarch/m68k/kernel/Makefile
- arch/m68k/kernel/Makefile_mm 17 additions, 0 deletionsarch/m68k/kernel/Makefile_mm
- arch/m68k/kernel/Makefile_no 0 additions, 0 deletionsarch/m68k/kernel/Makefile_no
- arch/m68k/kernel/asm-offsets.c 3 additions, 98 deletionsarch/m68k/kernel/asm-offsets.c
- arch/m68k/kernel/asm-offsets_mm.c 100 additions, 0 deletionsarch/m68k/kernel/asm-offsets_mm.c
- arch/m68k/kernel/asm-offsets_no.c 0 additions, 0 deletionsarch/m68k/kernel/asm-offsets_no.c
- arch/m68k/kernel/dma.c 5 additions, 130 deletionsarch/m68k/kernel/dma.c
Loading
Please register or sign in to comment