m68k: merge m68k and m68knommu arch directories
authorGreg Ungerer <gerg@uclinux.org>
Tue, 22 Mar 2011 03:39:27 +0000 (13:39 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Fri, 25 Mar 2011 04:05:13 +0000 (14:05 +1000)
commit66d857b08b8c3ed5c72c361f863cce77d2a978d7
tree47222d86f4d78dc0da31baf64188bd2e4b38ac1e
parentd39dd11c3e6a7af5c20bfac40594db36cf270f42
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>
170 files changed:
arch/m68k/Kconfig
arch/m68k/Kconfig.debug
arch/m68k/Kconfig.mmu [new file with mode: 0644]
arch/m68k/Kconfig.nommu [moved from arch/m68knommu/Kconfig with 93% similarity]
arch/m68k/Makefile
arch/m68k/Makefile_mm [new file with mode: 0644]
arch/m68k/Makefile_no [moved from arch/m68knommu/Makefile with 92% similarity]
arch/m68k/configs/m5208evb_defconfig [moved from arch/m68knommu/configs/m5208evb_defconfig with 97% similarity]
arch/m68k/configs/m5249evb_defconfig [moved from arch/m68knommu/configs/m5249evb_defconfig with 97% similarity]
arch/m68k/configs/m5272c3_defconfig [moved from arch/m68knommu/configs/m5272c3_defconfig with 96% similarity]
arch/m68k/configs/m5275evb_defconfig [moved from arch/m68knommu/configs/m5275evb_defconfig with 97% similarity]
arch/m68k/configs/m5307c3_defconfig [moved from arch/m68knommu/configs/m5307c3_defconfig with 97% similarity]
arch/m68k/configs/m5407c3_defconfig [moved from arch/m68knommu/configs/m5407c3_defconfig with 97% similarity]
arch/m68k/kernel/Makefile
arch/m68k/kernel/Makefile_mm [new file with mode: 0644]
arch/m68k/kernel/Makefile_no [moved from arch/m68knommu/kernel/Makefile with 100% similarity]
arch/m68k/kernel/asm-offsets.c
arch/m68k/kernel/asm-offsets_mm.c [copied from arch/m68knommu/kernel/asm-offsets.c with 55% similarity]
arch/m68k/kernel/asm-offsets_no.c [moved from arch/m68knommu/kernel/asm-offsets.c with 100% similarity]
arch/m68k/kernel/dma.c
arch/m68k/kernel/dma_mm.c [new file with mode: 0644]
arch/m68k/kernel/dma_no.c [moved from arch/m68knommu/kernel/dma.c with 100% similarity]
arch/m68k/kernel/entry.S
arch/m68k/kernel/entry_mm.S [new file with mode: 0644]
arch/m68k/kernel/entry_no.S [moved from arch/m68knommu/kernel/entry.S with 100% similarity]
arch/m68k/kernel/init_task.c [moved from arch/m68knommu/kernel/init_task.c with 100% similarity]
arch/m68k/kernel/irq.c [moved from arch/m68knommu/kernel/irq.c with 100% similarity]
arch/m68k/kernel/m68k_ksyms.c
arch/m68k/kernel/m68k_ksyms_mm.c [new file with mode: 0644]
arch/m68k/kernel/m68k_ksyms_no.c [moved from arch/m68knommu/kernel/m68k_ksyms.c with 100% similarity]
arch/m68k/kernel/module.c
arch/m68k/kernel/module_mm.c [copied from arch/m68knommu/kernel/module.c with 81% similarity]
arch/m68k/kernel/module_no.c [moved from arch/m68knommu/kernel/module.c with 100% similarity]
arch/m68k/kernel/process.c
arch/m68k/kernel/process_mm.c [copied from arch/m68knommu/kernel/process.c with 58% similarity]
arch/m68k/kernel/process_no.c [moved from arch/m68knommu/kernel/process.c with 100% similarity]
arch/m68k/kernel/ptrace.c
arch/m68k/kernel/ptrace_mm.c [new file with mode: 0644]
arch/m68k/kernel/ptrace_no.c [moved from arch/m68knommu/kernel/ptrace.c with 100% similarity]
arch/m68k/kernel/setup.c
arch/m68k/kernel/setup_mm.c [new file with mode: 0644]
arch/m68k/kernel/setup_no.c [moved from arch/m68knommu/kernel/setup.c with 100% similarity]
arch/m68k/kernel/signal.c
arch/m68k/kernel/signal_mm.c [copied from arch/m68knommu/kernel/signal.c with 63% similarity]
arch/m68k/kernel/signal_no.c [moved from arch/m68knommu/kernel/signal.c with 100% similarity]
arch/m68k/kernel/sys_m68k.c
arch/m68k/kernel/sys_m68k_mm.c [new file with mode: 0644]
arch/m68k/kernel/sys_m68k_no.c [moved from arch/m68knommu/kernel/sys_m68k.c with 100% similarity]
arch/m68k/kernel/syscalltable.S [moved from arch/m68knommu/kernel/syscalltable.S with 100% similarity]
arch/m68k/kernel/time.c
arch/m68k/kernel/time_mm.c [new file with mode: 0644]
arch/m68k/kernel/time_no.c [moved from arch/m68knommu/kernel/time.c with 100% similarity]
arch/m68k/kernel/traps.c
arch/m68k/kernel/traps_mm.c [new file with mode: 0644]
arch/m68k/kernel/traps_no.c [moved from arch/m68knommu/kernel/traps.c with 100% similarity]
arch/m68k/kernel/vmlinux.lds.S
arch/m68k/kernel/vmlinux.lds_mm.S [new file with mode: 0644]
arch/m68k/kernel/vmlinux.lds_no.S [moved from arch/m68knommu/kernel/vmlinux.lds.S with 100% similarity]
arch/m68k/lib/Makefile
arch/m68k/lib/Makefile_mm [new file with mode: 0644]
arch/m68k/lib/Makefile_no [moved from arch/m68knommu/lib/Makefile with 100% similarity]
arch/m68k/lib/checksum.c
arch/m68k/lib/checksum_mm.c [new file with mode: 0644]
arch/m68k/lib/checksum_no.c [moved from arch/m68knommu/lib/checksum.c with 100% similarity]
arch/m68k/lib/delay.c [moved from arch/m68knommu/lib/delay.c with 100% similarity]
arch/m68k/lib/divsi3.S [moved from arch/m68knommu/lib/divsi3.S with 100% similarity]
arch/m68k/lib/memcpy.c [moved from arch/m68knommu/lib/memcpy.c with 100% similarity]
arch/m68k/lib/memmove.c [moved from arch/m68knommu/lib/memmove.c with 100% similarity]
arch/m68k/lib/memset.c [moved from arch/m68knommu/lib/memset.c with 100% similarity]
arch/m68k/lib/modsi3.S [moved from arch/m68knommu/lib/modsi3.S with 100% similarity]
arch/m68k/lib/muldi3.c
arch/m68k/lib/muldi3_mm.c [moved from arch/m68knommu/lib/ashrdi3.c with 60% similarity]
arch/m68k/lib/muldi3_no.c [moved from arch/m68knommu/lib/muldi3.c with 100% similarity]
arch/m68k/lib/mulsi3.S [moved from arch/m68knommu/lib/mulsi3.S with 100% similarity]
arch/m68k/lib/udivsi3.S [moved from arch/m68knommu/lib/udivsi3.S with 100% similarity]
arch/m68k/lib/umodsi3.S [moved from arch/m68knommu/lib/umodsi3.S with 100% similarity]
arch/m68k/mm/Makefile
arch/m68k/mm/Makefile_mm [new file with mode: 0644]
arch/m68k/mm/Makefile_no [moved from arch/m68knommu/mm/Makefile with 100% similarity]
arch/m68k/mm/init.c
arch/m68k/mm/init_mm.c [new file with mode: 0644]
arch/m68k/mm/init_no.c [moved from arch/m68knommu/mm/init.c with 100% similarity]
arch/m68k/mm/kmap.c
arch/m68k/mm/kmap_mm.c [new file with mode: 0644]
arch/m68k/mm/kmap_no.c [moved from arch/m68knommu/mm/kmap.c with 100% similarity]
arch/m68k/platform/5206/Makefile [moved from arch/m68knommu/platform/5206/Makefile with 100% similarity]
arch/m68k/platform/5206/config.c [moved from arch/m68knommu/platform/5206/config.c with 100% similarity]
arch/m68k/platform/5206/gpio.c [moved from arch/m68knommu/platform/5206/gpio.c with 100% similarity]
arch/m68k/platform/5206e/Makefile [moved from arch/m68knommu/platform/5206e/Makefile with 100% similarity]
arch/m68k/platform/5206e/config.c [moved from arch/m68knommu/platform/5206e/config.c with 100% similarity]
arch/m68k/platform/5206e/gpio.c [moved from arch/m68knommu/platform/5206e/gpio.c with 100% similarity]
arch/m68k/platform/520x/Makefile [moved from arch/m68knommu/platform/520x/Makefile with 100% similarity]
arch/m68k/platform/520x/config.c [moved from arch/m68knommu/platform/520x/config.c with 100% similarity]
arch/m68k/platform/520x/gpio.c [moved from arch/m68knommu/platform/520x/gpio.c with 100% similarity]
arch/m68k/platform/523x/Makefile [moved from arch/m68knommu/platform/523x/Makefile with 100% similarity]
arch/m68k/platform/523x/config.c [moved from arch/m68knommu/platform/523x/config.c with 100% similarity]
arch/m68k/platform/523x/gpio.c [moved from arch/m68knommu/platform/523x/gpio.c with 100% similarity]
arch/m68k/platform/5249/Makefile [moved from arch/m68knommu/platform/5249/Makefile with 100% similarity]
arch/m68k/platform/5249/config.c [moved from arch/m68knommu/platform/5249/config.c with 100% similarity]
arch/m68k/platform/5249/gpio.c [moved from arch/m68knommu/platform/5249/gpio.c with 100% similarity]
arch/m68k/platform/5249/intc2.c [moved from arch/m68knommu/platform/5249/intc2.c with 100% similarity]
arch/m68k/platform/5272/Makefile [moved from arch/m68knommu/platform/5272/Makefile with 100% similarity]
arch/m68k/platform/5272/config.c [moved from arch/m68knommu/platform/5272/config.c with 100% similarity]
arch/m68k/platform/5272/gpio.c [moved from arch/m68knommu/platform/5272/gpio.c with 100% similarity]
arch/m68k/platform/5272/intc.c [moved from arch/m68knommu/platform/5272/intc.c with 100% similarity]
arch/m68k/platform/527x/Makefile [moved from arch/m68knommu/platform/527x/Makefile with 100% similarity]
arch/m68k/platform/527x/config.c [moved from arch/m68knommu/platform/527x/config.c with 100% similarity]
arch/m68k/platform/527x/gpio.c [moved from arch/m68knommu/platform/527x/gpio.c with 100% similarity]
arch/m68k/platform/528x/Makefile [moved from arch/m68knommu/platform/528x/Makefile with 100% similarity]
arch/m68k/platform/528x/config.c [moved from arch/m68knommu/platform/528x/config.c with 100% similarity]
arch/m68k/platform/528x/gpio.c [moved from arch/m68knommu/platform/528x/gpio.c with 100% similarity]
arch/m68k/platform/5307/Makefile [moved from arch/m68knommu/platform/5307/Makefile with 100% similarity]
arch/m68k/platform/5307/config.c [moved from arch/m68knommu/platform/5307/config.c with 100% similarity]
arch/m68k/platform/5307/gpio.c [moved from arch/m68knommu/platform/5307/gpio.c with 100% similarity]
arch/m68k/platform/5307/nettel.c [moved from arch/m68knommu/platform/5307/nettel.c with 100% similarity]
arch/m68k/platform/532x/Makefile [moved from arch/m68knommu/platform/532x/Makefile with 100% similarity]
arch/m68k/platform/532x/config.c [moved from arch/m68knommu/platform/532x/config.c with 100% similarity]
arch/m68k/platform/532x/gpio.c [moved from arch/m68knommu/platform/532x/gpio.c with 100% similarity]
arch/m68k/platform/5407/Makefile [moved from arch/m68knommu/platform/5407/Makefile with 100% similarity]
arch/m68k/platform/5407/config.c [moved from arch/m68knommu/platform/5407/config.c with 100% similarity]
arch/m68k/platform/5407/gpio.c [moved from arch/m68knommu/platform/5407/gpio.c with 100% similarity]
arch/m68k/platform/54xx/Makefile [moved from arch/m68knommu/platform/54xx/Makefile with 100% similarity]
arch/m68k/platform/54xx/config.c [moved from arch/m68knommu/platform/54xx/config.c with 100% similarity]
arch/m68k/platform/54xx/firebee.c [moved from arch/m68knommu/platform/54xx/firebee.c with 100% similarity]
arch/m68k/platform/68328/Makefile [moved from arch/m68knommu/platform/68328/Makefile with 100% similarity]
arch/m68k/platform/68328/bootlogo.h [moved from arch/m68knommu/platform/68328/bootlogo.h with 100% similarity]
arch/m68k/platform/68328/bootlogo.pl [moved from arch/m68knommu/platform/68328/bootlogo.pl with 100% similarity]
arch/m68k/platform/68328/config.c [moved from arch/m68knommu/platform/68328/config.c with 100% similarity]
arch/m68k/platform/68328/entry.S [moved from arch/m68knommu/platform/68328/entry.S with 100% similarity]
arch/m68k/platform/68328/head-de2.S [moved from arch/m68knommu/platform/68328/head-de2.S with 100% similarity]
arch/m68k/platform/68328/head-pilot.S [moved from arch/m68knommu/platform/68328/head-pilot.S with 100% similarity]
arch/m68k/platform/68328/head-ram.S [moved from arch/m68knommu/platform/68328/head-ram.S with 100% similarity]
arch/m68k/platform/68328/head-rom.S [moved from arch/m68knommu/platform/68328/head-rom.S with 100% similarity]
arch/m68k/platform/68328/ints.c [moved from arch/m68knommu/platform/68328/ints.c with 100% similarity]
arch/m68k/platform/68328/romvec.S [moved from arch/m68knommu/platform/68328/romvec.S with 100% similarity]
arch/m68k/platform/68328/timers.c [moved from arch/m68knommu/platform/68328/timers.c with 100% similarity]
arch/m68k/platform/68360/Makefile [moved from arch/m68knommu/platform/68360/Makefile with 100% similarity]
arch/m68k/platform/68360/commproc.c [moved from arch/m68knommu/platform/68360/commproc.c with 100% similarity]
arch/m68k/platform/68360/config.c [moved from arch/m68knommu/platform/68360/config.c with 100% similarity]
arch/m68k/platform/68360/entry.S [moved from arch/m68knommu/platform/68360/entry.S with 100% similarity]
arch/m68k/platform/68360/head-ram.S [moved from arch/m68knommu/platform/68360/head-ram.S with 100% similarity]
arch/m68k/platform/68360/head-rom.S [moved from arch/m68knommu/platform/68360/head-rom.S with 100% similarity]
arch/m68k/platform/68360/ints.c [moved from arch/m68knommu/platform/68360/ints.c with 100% similarity]
arch/m68k/platform/68EZ328/Makefile [moved from arch/m68knommu/platform/68EZ328/Makefile with 100% similarity]
arch/m68k/platform/68EZ328/bootlogo.h [moved from arch/m68knommu/platform/68EZ328/bootlogo.h with 100% similarity]
arch/m68k/platform/68EZ328/config.c [moved from arch/m68knommu/platform/68EZ328/config.c with 100% similarity]
arch/m68k/platform/68VZ328/Makefile [moved from arch/m68knommu/platform/68VZ328/Makefile with 100% similarity]
arch/m68k/platform/68VZ328/config.c [moved from arch/m68knommu/platform/68VZ328/config.c with 100% similarity]
arch/m68k/platform/Makefile [moved from arch/m68knommu/platform/Makefile with 100% similarity]
arch/m68k/platform/coldfire/Makefile [moved from arch/m68knommu/platform/coldfire/Makefile with 100% similarity]
arch/m68k/platform/coldfire/cache.c [moved from arch/m68knommu/platform/coldfire/cache.c with 100% similarity]
arch/m68k/platform/coldfire/clk.c [moved from arch/m68knommu/platform/coldfire/clk.c with 100% similarity]
arch/m68k/platform/coldfire/dma.c [moved from arch/m68knommu/platform/coldfire/dma.c with 100% similarity]
arch/m68k/platform/coldfire/dma_timer.c [moved from arch/m68knommu/platform/coldfire/dma_timer.c with 100% similarity]
arch/m68k/platform/coldfire/entry.S [moved from arch/m68knommu/platform/coldfire/entry.S with 100% similarity]
arch/m68k/platform/coldfire/gpio.c [moved from arch/m68knommu/platform/coldfire/gpio.c with 100% similarity]
arch/m68k/platform/coldfire/head.S [moved from arch/m68knommu/platform/coldfire/head.S with 100% similarity]
arch/m68k/platform/coldfire/intc-2.c [moved from arch/m68knommu/platform/coldfire/intc-2.c with 100% similarity]
arch/m68k/platform/coldfire/intc-simr.c [moved from arch/m68knommu/platform/coldfire/intc-simr.c with 100% similarity]
arch/m68k/platform/coldfire/intc.c [moved from arch/m68knommu/platform/coldfire/intc.c with 100% similarity]
arch/m68k/platform/coldfire/pinmux.c [moved from arch/m68knommu/platform/coldfire/pinmux.c with 100% similarity]
arch/m68k/platform/coldfire/pit.c [moved from arch/m68knommu/platform/coldfire/pit.c with 100% similarity]
arch/m68k/platform/coldfire/sltimers.c [moved from arch/m68knommu/platform/coldfire/sltimers.c with 100% similarity]
arch/m68k/platform/coldfire/timers.c [moved from arch/m68knommu/platform/coldfire/timers.c with 100% similarity]
arch/m68k/platform/coldfire/vectors.c [moved from arch/m68knommu/platform/coldfire/vectors.c with 100% similarity]
arch/m68knommu/Kconfig.debug [deleted file]
arch/m68knommu/defconfig [deleted file]
arch/m68knommu/kernel/.gitignore [deleted file]
arch/m68knommu/lib/ashldi3.c [deleted file]
arch/m68knommu/lib/lshrdi3.c [deleted file]