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: NGreg Ungerer <gerg@uclinux.org>
Showing
arch/m68k/Kconfig.mmu
0 → 100644
arch/m68k/Makefile_mm
0 → 100644
arch/m68k/kernel/Makefile_mm
0 → 100644
arch/m68k/kernel/asm-offsets_mm.c
0 → 100644
arch/m68k/kernel/dma_mm.c
0 → 100644
arch/m68k/kernel/entry_mm.S
0 → 100644
arch/m68k/kernel/m68k_ksyms_mm.c
0 → 100644
arch/m68k/kernel/module_mm.c
0 → 100644
arch/m68k/kernel/process_mm.c
0 → 100644
arch/m68k/kernel/ptrace_mm.c
0 → 100644
此差异已折叠。
arch/m68k/kernel/setup_mm.c
0 → 100644
此差异已折叠。
arch/m68k/kernel/signal_mm.c
0 → 100644
此差异已折叠。
arch/m68k/kernel/sys_m68k_mm.c
0 → 100644
此差异已折叠。
arch/m68k/kernel/time_mm.c
0 → 100644
此差异已折叠。
arch/m68k/kernel/traps_mm.c
0 → 100644
此差异已折叠。
arch/m68k/kernel/vmlinux.lds_mm.S
0 → 100644
arch/m68k/lib/Makefile_mm
0 → 100644
arch/m68k/lib/checksum_mm.c
0 → 100644
此差异已折叠。
arch/m68k/mm/Makefile_mm
0 → 100644
此差异已折叠。
arch/m68k/mm/init_mm.c
0 → 100644
此差异已折叠。
此差异已折叠。
arch/m68k/mm/kmap_mm.c
0 → 100644
此差异已折叠。
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
文件已移动
arch/m68knommu/Kconfig.debug
已删除
100644 → 0
此差异已折叠。
arch/m68knommu/defconfig
已删除
100644 → 0
此差异已折叠。
此差异已折叠。
arch/m68knommu/lib/ashldi3.c
已删除
100644 → 0
此差异已折叠。
arch/m68knommu/lib/lshrdi3.c
已删除
100644 → 0
此差异已折叠。
想要评论请 注册 或 登录