diff options
author | Greg Ungerer <gerg@uclinux.org> | 2011-03-22 13:39:27 +1000 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2011-03-25 14:05:13 +1000 |
commit | 66d857b08b8c3ed5c72c361f863cce77d2a978d7 (patch) | |
tree | 47222d86f4d78dc0da31baf64188bd2e4b38ac1e | |
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>
-rw-r--r-- | arch/m68k/Kconfig | 456 | ||||
-rw-r--r-- | arch/m68k/Kconfig.debug | 34 | ||||
-rw-r--r-- | arch/m68k/Kconfig.mmu | 417 | ||||
-rw-r--r-- | arch/m68k/Kconfig.nommu (renamed from arch/m68knommu/Kconfig) | 94 | ||||
-rw-r--r-- | arch/m68k/Makefile | 122 | ||||
-rw-r--r-- | arch/m68k/Makefile_mm | 121 | ||||
-rw-r--r-- | arch/m68k/Makefile_no (renamed from arch/m68knommu/Makefile) | 16 | ||||
-rw-r--r-- | arch/m68k/configs/m5208evb_defconfig (renamed from arch/m68knommu/configs/m5208evb_defconfig) | 2 | ||||
-rw-r--r-- | arch/m68k/configs/m5249evb_defconfig (renamed from arch/m68knommu/configs/m5249evb_defconfig) | 2 | ||||
-rw-r--r-- | arch/m68k/configs/m5272c3_defconfig (renamed from arch/m68knommu/configs/m5272c3_defconfig) | 2 | ||||
-rw-r--r-- | arch/m68k/configs/m5275evb_defconfig (renamed from arch/m68knommu/configs/m5275evb_defconfig) | 2 | ||||
-rw-r--r-- | arch/m68k/configs/m5307c3_defconfig (renamed from arch/m68knommu/configs/m5307c3_defconfig) | 2 | ||||
-rw-r--r-- | arch/m68k/configs/m5407c3_defconfig (renamed from arch/m68knommu/configs/m5407c3_defconfig) | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/Makefile | 18 | ||||
-rw-r--r-- | arch/m68k/kernel/Makefile_mm | 17 | ||||
-rw-r--r-- | arch/m68k/kernel/Makefile_no (renamed from arch/m68knommu/kernel/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/asm-offsets.c | 101 | ||||
-rw-r--r-- | arch/m68k/kernel/asm-offsets_mm.c | 100 | ||||
-rw-r--r-- | arch/m68k/kernel/asm-offsets_no.c (renamed from arch/m68knommu/kernel/asm-offsets.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/dma.c | 135 | ||||
-rw-r--r-- | arch/m68k/kernel/dma_mm.c | 130 | ||||
-rw-r--r-- | arch/m68k/kernel/dma_no.c (renamed from arch/m68knommu/kernel/dma.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/entry.S | 756 | ||||
-rw-r--r-- | arch/m68k/kernel/entry_mm.S | 753 | ||||
-rw-r--r-- | arch/m68k/kernel/entry_no.S (renamed from arch/m68knommu/kernel/entry.S) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/init_task.c (renamed from arch/m68knommu/kernel/init_task.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/irq.c (renamed from arch/m68knommu/kernel/irq.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/m68k_ksyms.c | 21 | ||||
-rw-r--r-- | arch/m68k/kernel/m68k_ksyms_mm.c | 16 | ||||
-rw-r--r-- | arch/m68k/kernel/m68k_ksyms_no.c (renamed from arch/m68knommu/kernel/m68k_ksyms.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/module.c | 156 | ||||
-rw-r--r-- | arch/m68k/kernel/module_mm.c | 155 | ||||
-rw-r--r-- | arch/m68k/kernel/module_no.c (renamed from arch/m68knommu/kernel/module.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/process.c | 355 | ||||
-rw-r--r-- | arch/m68k/kernel/process_mm.c | 354 | ||||
-rw-r--r-- | arch/m68k/kernel/process_no.c (renamed from arch/m68knommu/kernel/process.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/ptrace.c | 282 | ||||
-rw-r--r-- | arch/m68k/kernel/ptrace_mm.c | 277 | ||||
-rw-r--r-- | arch/m68k/kernel/ptrace_no.c (renamed from arch/m68knommu/kernel/ptrace.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/setup.c | 534 | ||||
-rw-r--r-- | arch/m68k/kernel/setup_mm.c | 533 | ||||
-rw-r--r-- | arch/m68k/kernel/setup_no.c (renamed from arch/m68knommu/kernel/setup.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/signal.c | 1018 | ||||
-rw-r--r-- | arch/m68k/kernel/signal_mm.c | 1017 | ||||
-rw-r--r-- | arch/m68k/kernel/signal_no.c (renamed from arch/m68knommu/kernel/signal.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/sys_m68k.c | 551 | ||||
-rw-r--r-- | arch/m68k/kernel/sys_m68k_mm.c | 546 | ||||
-rw-r--r-- | arch/m68k/kernel/sys_m68k_no.c (renamed from arch/m68knommu/kernel/sys_m68k.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/syscalltable.S (renamed from arch/m68knommu/kernel/syscalltable.S) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/time.c | 119 | ||||
-rw-r--r-- | arch/m68k/kernel/time_mm.c | 114 | ||||
-rw-r--r-- | arch/m68k/kernel/time_no.c (renamed from arch/m68knommu/kernel/time.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/traps.c | 1208 | ||||
-rw-r--r-- | arch/m68k/kernel/traps_mm.c | 1207 | ||||
-rw-r--r-- | arch/m68k/kernel/traps_no.c (renamed from arch/m68knommu/kernel/traps.c) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/vmlinux.lds.S | 11 | ||||
-rw-r--r-- | arch/m68k/kernel/vmlinux.lds_mm.S | 10 | ||||
-rw-r--r-- | arch/m68k/kernel/vmlinux.lds_no.S (renamed from arch/m68knommu/kernel/vmlinux.lds.S) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/Makefile | 11 | ||||
-rw-r--r-- | arch/m68k/lib/Makefile_mm | 6 | ||||
-rw-r--r-- | arch/m68k/lib/Makefile_no (renamed from arch/m68knommu/lib/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/checksum.c | 430 | ||||
-rw-r--r-- | arch/m68k/lib/checksum_mm.c | 425 | ||||
-rw-r--r-- | arch/m68k/lib/checksum_no.c (renamed from arch/m68knommu/lib/checksum.c) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/delay.c (renamed from arch/m68knommu/lib/delay.c) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/divsi3.S (renamed from arch/m68knommu/lib/divsi3.S) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/memcpy.c (renamed from arch/m68knommu/lib/memcpy.c) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/memmove.c (renamed from arch/m68knommu/lib/memmove.c) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/memset.c (renamed from arch/m68knommu/lib/memset.c) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/modsi3.S (renamed from arch/m68knommu/lib/modsi3.S) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/muldi3.c | 68 | ||||
-rw-r--r-- | arch/m68k/lib/muldi3_mm.c (renamed from arch/m68knommu/lib/ashrdi3.c) | 48 | ||||
-rw-r--r-- | arch/m68k/lib/muldi3_no.c (renamed from arch/m68knommu/lib/muldi3.c) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/mulsi3.S (renamed from arch/m68knommu/lib/mulsi3.S) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/udivsi3.S (renamed from arch/m68knommu/lib/udivsi3.S) | 0 | ||||
-rw-r--r-- | arch/m68k/lib/umodsi3.S (renamed from arch/m68knommu/lib/umodsi3.S) | 0 | ||||
-rw-r--r-- | arch/m68k/mm/Makefile | 13 | ||||
-rw-r--r-- | arch/m68k/mm/Makefile_mm | 8 | ||||
-rw-r--r-- | arch/m68k/mm/Makefile_no (renamed from arch/m68knommu/mm/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/mm/init.c | 153 | ||||
-rw-r--r-- | arch/m68k/mm/init_mm.c | 150 | ||||
-rw-r--r-- | arch/m68k/mm/init_no.c (renamed from arch/m68knommu/mm/init.c) | 0 | ||||
-rw-r--r-- | arch/m68k/mm/kmap.c | 368 | ||||
-rw-r--r-- | arch/m68k/mm/kmap_mm.c | 367 | ||||
-rw-r--r-- | arch/m68k/mm/kmap_no.c (renamed from arch/m68knommu/mm/kmap.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5206/Makefile (renamed from arch/m68knommu/platform/5206/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5206/config.c (renamed from arch/m68knommu/platform/5206/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5206/gpio.c (renamed from arch/m68knommu/platform/5206/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5206e/Makefile (renamed from arch/m68knommu/platform/5206e/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5206e/config.c (renamed from arch/m68knommu/platform/5206e/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5206e/gpio.c (renamed from arch/m68knommu/platform/5206e/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/520x/Makefile (renamed from arch/m68knommu/platform/520x/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/520x/config.c (renamed from arch/m68knommu/platform/520x/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/520x/gpio.c (renamed from arch/m68knommu/platform/520x/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/523x/Makefile (renamed from arch/m68knommu/platform/523x/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/523x/config.c (renamed from arch/m68knommu/platform/523x/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/523x/gpio.c (renamed from arch/m68knommu/platform/523x/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5249/Makefile (renamed from arch/m68knommu/platform/5249/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5249/config.c (renamed from arch/m68knommu/platform/5249/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5249/gpio.c (renamed from arch/m68knommu/platform/5249/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5249/intc2.c (renamed from arch/m68knommu/platform/5249/intc2.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5272/Makefile (renamed from arch/m68knommu/platform/5272/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5272/config.c (renamed from arch/m68knommu/platform/5272/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5272/gpio.c (renamed from arch/m68knommu/platform/5272/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5272/intc.c (renamed from arch/m68knommu/platform/5272/intc.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/527x/Makefile (renamed from arch/m68knommu/platform/527x/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/527x/config.c (renamed from arch/m68knommu/platform/527x/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/527x/gpio.c (renamed from arch/m68knommu/platform/527x/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/528x/Makefile (renamed from arch/m68knommu/platform/528x/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/528x/config.c (renamed from arch/m68knommu/platform/528x/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/528x/gpio.c (renamed from arch/m68knommu/platform/528x/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5307/Makefile (renamed from arch/m68knommu/platform/5307/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5307/config.c (renamed from arch/m68knommu/platform/5307/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5307/gpio.c (renamed from arch/m68knommu/platform/5307/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5307/nettel.c (renamed from arch/m68knommu/platform/5307/nettel.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/532x/Makefile (renamed from arch/m68knommu/platform/532x/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/532x/config.c (renamed from arch/m68knommu/platform/532x/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/532x/gpio.c (renamed from arch/m68knommu/platform/532x/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5407/Makefile (renamed from arch/m68knommu/platform/5407/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5407/config.c (renamed from arch/m68knommu/platform/5407/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/5407/gpio.c (renamed from arch/m68knommu/platform/5407/gpio.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/54xx/Makefile (renamed from arch/m68knommu/platform/54xx/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/54xx/config.c (renamed from arch/m68knommu/platform/54xx/config.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/54xx/firebee.c (renamed from arch/m68knommu/platform/54xx/firebee.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/68328/Makefile (renamed from arch/m68knommu/platform/68328/Makefile) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/68328/bootlogo.h (renamed from arch/m68knommu/platform/68328/bootlogo.h) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/68328/bootlogo.pl |