On Sat, Oct 17, 2009 at 06:02:58PM -0700, Steven King wrote:
This is a script and patch to merge the m68knommu arch into m68k. 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 The patch modifies the toplevel Makefile so that ARCH=m68knommu still works (by setting SRCARCH=m68k) and adds the m68knommu Kconfig and Makefile to the m68k Kconfig and Makefile, using the definition of ARCH to select which values to use. Thus when building for either a m68k or an m68knommu target, one still specifies either ARCH=m68k or ARCH=m68knommu and everything should build EXACTLY as it did pre-merge. (I think).
Hi Steven. This looks good! The mechanical method you are using really makes it simple to do the merge. And it also nicely highlights which files that really differs. There is obviously more that can be merged later but this is the first and biggest step.
Signed-off-by: Steven King <sfking@xxxxxxxxx>
Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx> Sam -- To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
